aboutsummaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2011-05-18 23:08:13 +0200
committerTom Gundersen <teg@jklm.no>2011-05-19 14:33:35 +0200
commitcc1b8a39309fef45d092140fa130d0e82c696a44 (patch)
tree0d8cdc3ff5d408071bb7860d80e4f184bdd85d26 /rc.sysinit
parent99d64f5789f01243903be4b32078ec38bdce75fa (diff)
downloadinitscripts-cc1b8a39309fef45d092140fa130d0e82c696a44.tar.xz
fixup: also clear /tmp if it is a mountpoint
eda191cf78365cc3d1 inadvertently introduced a change so that /tmp was not cleared if it was a mountpoint. This restores the old behaviour. It is strongly adviced to not monut anything but a tmpfs on /tmp. This would avoid the issue. Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit2
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.sysinit b/rc.sysinit
index 2250546..46f0c9b 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -316,7 +316,7 @@ fi
stat_busy "Removing Leftover Files"
/bin/rm -rf /etc/{nologin,shutdownpid} /forcefsck &>/dev/null
-/bin/mountpoint -q /tmp || /bin/rm -rf /tmp/* /tmp/.* &>/dev/null
+/bin/rm -rf /tmp/* /tmp/.* &>/dev/null
[[ ! -L /var/lock ]] && /bin/rm -rf /var/lock/*
[[ ! -L /var/run && -d /var/run ]] && /usr/bin/find /var/run/ \! -type d -delete
[[ ! -L /var/run && ! -L /var/run/daemons ]] && /bin/rm -rf /var/run/daemons \