aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-07-11 17:27:46 +0000
committerRoy Marples <roy@marples.name>2007-07-11 17:27:46 +0000
commit5257ba51b9524b101533308024862e4344c8b6f6 (patch)
tree71c5eab595f685a02f2ab2a8adfcac304406c4e4 /sh
parente778dcbfb0ef9cb8101ac7e51c88c322f7ccbd22 (diff)
Don't unmount network filesystems in localmount or halt.sh, #175602.
Diffstat (limited to 'sh')
-rw-r--r--sh/rc-mount.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh
index be9dffba..17ef9b5f 100644
--- a/sh/rc-mount.sh
+++ b/sh/rc-mount.sh
@@ -1,9 +1,9 @@
# Copyright 2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# bool do_unmount(char *cmd, char *no_unmounts, char *nodes, char *fslist)
+# bool do_unmount(char *cmd, char *no_unmounts, char *nodes, char *fslist, char *no_fslist)
# Handy function to handle all our unmounting needs
-# find-mount is a C program to actually find our mounts on our supported OS's
+# mountinfo is a C program to actually find our mounts on our supported OS's
do_unmount() {
local cmd="$1" retval=0 retry=
local f_opts="-m -c" f_kill="-s " mnt=
@@ -12,7 +12,7 @@ do_unmount() {
f_kill="-"
fi
- local mnts="$(mountinfo ${2:+--skip-regex} $2 ${3:+--node-regex} $3 ${4:+--fstype-regex} $4 --reverse \
+ local mnts="$(mountinfo ${2:+--skip-point-regex} $2 ${3:+--node-regex} $3 ${4:+--fstype-regex} $4 ${5:+--skip-fstype-regex} $5 \
| sed -e "s/'/'\\\\''/g" -e "s/^/'/g" -e "s/$/'/g")"
eval set -- ${mnts}
for mnt in "$@" ; do