sync mkparabolaiso and initcpios with archiso v46

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 9 insertions, 5 deletions

diff --git a/parabolaiso/initcpio/script/parabolaiso_shutdown b/parabolaiso/initcpio/script/parabolaiso_shutdown
index 143df04..d12cd90 100644
--- a/parabolaiso/initcpio/script/parabolaiso_shutdown
+++ b/parabolaiso/initcpio/script/parabolaiso_shutdown
@@ -1,19 +1,21 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # /oldroot depends on things inside /oldroot/run/parabolaiso...
 mkdir /oldrun
 mount -n --move /oldroot/run /oldrun
 
 # Unmount all mounts now.
-umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)
+umount "$(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)"
 
 # Remove all dm-snapshot devices.
 dmsetup remove_all
 
 # Remove all loopback devices.
 for _lup in $(grep ^/dev/loop /oldrun/parabolaiso/used_block_devices | tac); do
-    if ! losetup -d ${_lup} 2> /dev/null; then
-        umount -d ${_lup}
+    if ! losetup -d -- "${_lup}" 2> /dev/null; then
+        umount -d -- "${_lup}"
     fi
 done
 
@@ -21,8 +23,8 @@ done
 umount /oldrun/parabolaiso/cowspace
 
 # Unmount boot device if needed (no copytoram=y used)
-if [[ ! -d /oldrun/parabolaiso/copytoram ]]; then
-    if [[ -d /oldrun/parabolaiso/img_dev ]]; then
+if [ ! -d /oldrun/parabolaiso/copytoram ]; then
+    if [ -d /oldrun/parabolaiso/img_dev ]; then
         umount /oldrun/parabolaiso/img_dev
     else
         umount /oldrun/parabolaiso/bootmnt
@@ -35,3 +37,5 @@ case "$1" in
   reboot|poweroff|halt) "$1" -f ;;
   *) halt -f;;
 esac
+
+# vim: set ft=sh: