From: Harald Hoyer <harald@redhat.com>
Date: Tue, 9 Feb 2021 15:34:35 +0000 (+0100)
Subject: fix: correct the squash quirk
X-Git-Tag: 052~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ebf454884bb4c235558f3fc85a3c024689cc28f;p=thirdparty%2Fdracut.git

fix: correct the squash quirk

Previously with `no_kernel` the `for` loop errored on the modules
wildcard. By checking, if the file exists, this is mitigated.

"mv" asked interactively, if aliased in the user session, so a "--force"
was added.
---

diff --git a/dracut.sh b/dracut.sh
index a6cbc3dd9..60d5c0ac5 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -2007,7 +2007,7 @@ if dracut_module_included "squash"; then
         $squash_dir/usr/lib/dracut/* \
         $squash_dir/etc/initrd-release
     do
-        [[ -d $file ]] && continue
+        [[ -f $file ]] || continue
         DRACUT_RESOLVE_DEPS=1 dracutsysrootdir=$squash_dir inst ${file#$squash_dir}
         rm $file
     done
@@ -2029,7 +2029,7 @@ if dracut_module_included "squash"; then
     for folder in "${squash_candidate[@]}"; do
         for file in $(find $initdir/$folder/ -not -type d); do
             if [[ -e $squash_dir${file#$initdir} ]]; then
-                mv $squash_dir${file#$initdir} $file
+                mv -f $squash_dir${file#$initdir} $file
             fi
         done
     done