aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-07-09 16:20:48 +0000
committerRoy Marples <roy@marples.name>2008-07-09 16:20:48 +0000
commit7183cb1b18957f05026e27036f7d70da1571f619 (patch)
treebbd7210dcd7be0e0a6419ad83a2385b1aee224e9
parentb83108cd2e44bd20840295d595160c6354ed4256 (diff)
Fix last commit
-rw-r--r--init.d/halt.sh.in2
-rw-r--r--init.d/localmount.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/init.d/halt.sh.in b/init.d/halt.sh.in
index 8431b1cb..2b569ed6 100644
--- a/init.d/halt.sh.in
+++ b/init.d/halt.sh.in
@@ -100,7 +100,7 @@ if [ "${RC_UNAME}" = "Linux" ]; then
done
[ -n "${fs}" ] && fs="^(${fs})$"
do_unmount "mount -n -o remount,ro" \
- --skip-point-regex "^(/dev|/dev/.*|/proc|/proc/.*|/sys|/sys/.*)$" \
+ --skip-point-regex "${no_umounts_r}" \
${fs:+--skip-fstype-regex} ${fs} --nonetdev
eoutdent
eend $?
diff --git a/init.d/localmount.in b/init.d/localmount.in
index bcd39e7d..c9c39db4 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -47,7 +47,7 @@ stop()
if [ "${RC_UNAME}" = "Linux" ]; then
no_umounts_r="${no_umounts_r}|/proc|/proc/.*|/sys|/sys/.*"
fi
- no_umounts_r="^(${no_umounts})$"
+ no_umounts_r="^(${no_umounts_r})$"
# Flush all pending disk writes now
sync; sync
@@ -76,7 +76,7 @@ stop()
fs="${fs}${fs:+|}${x}"
done
[ -n "${fs}" ] && fs="^(${fs})$"
- do_unmount "umount" --skip-point-regex "${no_umounts}" \
+ do_unmount "umount" --skip-point-regex "${no_umounts_r}" \
${fs:+--skip-fstype-regex} ${fs} --nonetdev
eoutdent