dmsquash-live/iso-scan: do the iso scan regardless of /dev/loop0

The loop driver could be a module and would never be loaded, so the
iso-scan never takes place.

To let the iso-scan happen, it is now placed into the initqueue/settled
unconditionally.

diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
index 36a6a2d1d759ef271843920819028c5fa3e775cd..d4d3b1dd5b6bfade5d680a7e109c30ad3577e707 100755 (executable)
--- a/modules.d/90dmsquash-live/iso-scan.sh
+++ b/modules.d/90dmsquash-live/iso-scan.sh
@@ -10,7 +10,7 @@ isofile=$1
 
 [ -z "$isofile" ] && exit 1
 
-ismounted "/run/initramfs/isoscan" && exit 1
+ismounted "/run/initramfs/isoscan" && exit 0
 
 mkdir -p "/run/initramfs/isoscan"
 

diff --git a/modules.d/90dmsquash-live/parse-iso-scan.sh b/modules.d/90dmsquash-live/parse-iso-scan.sh
index c79bf2cf5fc891432649dd6d2572e6caa8106b6e..92b0c6e0bc49b1c5fe11b34e64584ff92975ab39 100755 (executable)
--- a/modules.d/90dmsquash-live/parse-iso-scan.sh
+++ b/modules.d/90dmsquash-live/parse-iso-scan.sh
@@ -7,8 +7,5 @@
 isofile=$(getarg iso-scan/filename)
 
 if [ -n "$isofile" ]; then
-    {
-        printf 'KERNEL=="loop0", RUN+="/sbin/initqueue --settled --unique /sbin/iso-scan %s"\n' \
-            "'${isofile}'"
-    } >> /etc/udev/rules.d/99-isofile-mount.rules
+    /sbin/initqueue --settled --unique /sbin/iso-scan "$isofile"
 fi