diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2007-09-09 16:08:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-09-09 16:08:32 +0000 |
| commit | 869da3c68587499e7e1a47bc8fb511b2f1d6ac0d (patch) | |
| tree | 3d26b60e6c8f0bdbf4d8923abdf9b48925d1ba33 /init.d/bootmisc | |
| parent | 230421384a6be1239b390fc12f73b0b223705609 (diff) | |
only do the X lock stuff in /tmp so people can overload WIPE_TMP_DIRS for a general "wipe this directory" option. also force +t on /tmp and /var/tmp.
Diffstat (limited to 'init.d/bootmisc')
| -rwxr-xr-x | init.d/bootmisc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/init.d/bootmisc b/init.d/bootmisc index 2d354196..b475ab82 100755 --- a/init.d/bootmisc +++ b/init.d/bootmisc @@ -44,15 +44,6 @@ cleanup_tmp_dir() { ${dir}/ksocket-* ${dir}/.*-unix eend 0 fi - chmod +t ${dir} - - # 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 - rm -rf ${dir}/.ICE-unix ${dir}/.X11-unix - mkdir -p ${dir}/.ICE-unix ${dir}/.X11-unix - chmod 1777 ${dir}/.ICE-unix ${dir}/.X11-unix - [ -x /sbin/restorecon ] && restorecon ${dir}/.ICE-unix ${dir}/.X11-unix } start() { @@ -136,6 +127,15 @@ start() { for tmp in ${WIPE_TMP_DIRS-/tmp} ; do cleanup_tmp_dir ${tmp} done + chmod +t /tmp /var/tmp + + # 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 + rm -rf /tmp/.ICE-unix /tmp/.X11-unix + mkdir -p /tmp/.ICE-unix /tmp/.X11-unix + chmod 1777 /tmp/.ICE-unix /tmp/.X11-unix + [ -x /sbin/restorecon ] && restorecon /tmp/.ICE-unix /tmp/.X11-unix # Create an 'after-boot' dmesg log if [ "${RC_SYS}" != "VPS" ] ; then |