Use "checkpath -W" instead of dir_writable()

This commit is contained in:
Christian Ruppert
2012-01-28 19:32:05 +01:00
parent 5a8344a3d1
commit fb4aa20d05
5 changed files with 7 additions and 12 deletions

View File

@@ -20,7 +20,7 @@ cleanup_tmp_dir()
if ! [ -d "$dir" ]; then
mkdir -p "$dir" || return $?
fi
dir_writable "$dir" || return 1
checkpath -W "$dir" || return 1
chmod a+rwt "$dir" 2> /dev/null
cd "$dir" || return 1
if yesno $wipe_tmp; then
@@ -117,7 +117,7 @@ start()
migrate_to_run /var/run /run
fi
if dir_writable /var/run; then
if checkpath -W /var/run; then
ebegin "Creating user login records"
local xtra=
[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -159,7 +159,7 @@ start()
cleanup_tmp_dir "$tmp"
done
if dir_writable /tmp; then
if checkpath -W /tmp; then
# Make sure our X11 stuff have the correct permissions
# Omit the chown as bootmisc is run before network is up
# and users may be using lame LDAP auth #139411
@@ -172,7 +172,7 @@ start()
fi
if yesno $log_dmesg; then
if $logw || dir_writable /var/log; then
if $logw || checkpath -W /var/log; then
# Create an 'after-boot' dmesg log
if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
dmesg > /var/log/dmesg