emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Mike Frysinger 2007-09-09 16:08:32 +00:00
parent 230421384a
commit 869da3c685
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,7 +3,8 @@
09 Sep 2007; Mike Frysinger <vapier@gentoo.org>: 09 Sep 2007; Mike Frysinger <vapier@gentoo.org>:
Allow people to specify a list of temp dirs to clean in bootmisc #191807. Allow people to specify a list of dirs to clean in bootmisc #191807. Force
the +t bit on /tmp and /var/tmp paths.
Allow people to specify a list of early mount points which will be mounted Allow people to specify a list of early mount points which will be mounted
at the end of localmount so they can do tmpfs on things like /tmp #181527. at the end of localmount so they can do tmpfs on things like /tmp #181527.

18
init.d/bootmisc
View File

@ -44,15 +44,6 @@ cleanup_tmp_dir() {
${dir}/ksocket-* ${dir}/.*-unix ${dir}/ksocket-* ${dir}/.*-unix
eend 0 eend 0
fi 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() { start() {
@ -136,6 +127,15 @@ start() {
for tmp in ${WIPE_TMP_DIRS-/tmp} ; do for tmp in ${WIPE_TMP_DIRS-/tmp} ; do
cleanup_tmp_dir ${tmp} cleanup_tmp_dir ${tmp}
done 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 # Create an 'after-boot' dmesg log
if [ "${RC_SYS}" != "VPS" ] ; then if [ "${RC_SYS}" != "VPS" ] ; then