netmount, localmount, halt.sh and net scripts now check OS specific flags to see if a mount is network mounted (linux = fstab, *bsd = "local" in mount options) or not, #192772.

This commit is contained in:
Roy Marples
2007-10-09 15:33:05 +00:00
parent e89805e0c0
commit dc0ba7ebf3
7 changed files with 111 additions and 46 deletions

View File

@@ -203,7 +203,8 @@ stop() {
# Umount loopback devices
einfo "Unmounting loopback devices"
eindent
do_unmount "umount -d" "${no_umounts}" "^/dev/loop"
do_unmount "umount -d" --skip-point-regex "${no_umounts}" \
--node-regex "^/dev/loop"
eoutdent
# Now everything else, except network filesystems as the
@@ -215,7 +216,8 @@ stop() {
fs="${fs}${fs:+|}${x}"
done
[ -n "${fs}" ] && fs="^(${fs})$"
do_unmount "umount" "${no_umounts}" "" "" "${fs}"
do_unmount "umount" --skip-point-regex "${no_umounts}" \
${fs:+--skip-fstype-regex} ${fs} --nonetdev
eoutdent
return 0