summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-03-29 20:53:38 +0200
committerDave Reisner <dreisner@archlinux.org>2012-04-02 00:29:55 +0200
commit5a7040d717646d31833880dae2e61daec4ad2e6c (patch)
tree9ce60c4dbab81a19f1c464cdcd0447ab7cb996fe
parent20509ade3d025fe76bcdc036dfd49aa44f63d470 (diff)
downloadmkinitcpio-5a7040d717646d31833880dae2e61daec4ad2e6c.tar.gz
mkinitcpio-5a7040d717646d31833880dae2e61daec4ad2e6c.tar.xz
shutdown: refine umount_all logic
remove the mountpoint filtering from the awk processing and drop the -l flag from umount. Not clear why either of these were present -- they're both wrong. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rwxr-xr-xshutdown6
1 files changed, 3 insertions, 3 deletions
diff --git a/shutdown b/shutdown
index 2e6f504..20510b2 100755
--- a/shutdown
+++ b/shutdown
@@ -57,10 +57,10 @@ disassemble() {
printf '%s\n' "Unmounting all devices."
-# unmount everything, but leave the API mounts
+# unmount everything in /oldroot
findmnt -Rruno TARGET /oldroot | awk '
BEGIN { i = 0 }
-! /^\/(proc|dev|sys)/ {
+{
i++
mounts[i] = $0
}
@@ -70,7 +70,7 @@ END {
}
}
' | while read -r mount; do
- umount -l "$mount"
+ umount "$mount"
done
printf '%s\n' "Disassembling stacked devices."