From: Harald Hoyer <harald@redhat.com>
Date: Fri, 24 Apr 2015 10:13:42 +0000 (+0200)
Subject: dmsquash-live/apply-live-updates.sh: needs 'find'
X-Git-Tag: 042~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4851deca54795eedd68d851b31bedfccd4c2993c;p=thirdparty%2Fdracut.git

dmsquash-live/apply-live-updates.sh: needs 'find'

also add /run/initramfs/live/updates as a directory, where to pull
the updates from

https://bugzilla.redhat.com/show_bug.cgi?id=1213736
---

diff --git a/modules.d/90dmsquash-live/apply-live-updates.sh b/modules.d/90dmsquash-live/apply-live-updates.sh
index d620f2c94..6a1993bed 100755
--- a/modules.d/90dmsquash-live/apply-live-updates.sh
+++ b/modules.d/90dmsquash-live/apply-live-updates.sh
@@ -1,17 +1,20 @@
 #!/bin/sh
 
-if [ -b /dev/mapper/live-rw ] && [ -d /updates ]; then
+if [ -b /dev/mapper/live-rw ] && [ -d /run/initramfs/live/updates -o -d /updates ]; then
     info "Applying updates to live image..."
     mount -o bind /run $NEWROOT/run
     # avoid overwriting symlinks (e.g. /lib -> /usr/lib) with directories
-    (
-        cd /updates
-        find . -depth -type d | while read dir; do
-            mkdir -p "$NEWROOT/$dir"
-        done
-        find . -depth \! -type d | while read file; do
-            cp -a "$file" "$NEWROOT/$file"
-        done
-    )
+    for d in /updates /run/initramfs/live/updates; do
+        [ -d "$d" ] || continue
+        (
+            cd $d
+            find . -depth -type d | while read dir; do
+                mkdir -p "$NEWROOT/$dir"
+            done
+            find . -depth \! -type d | while read file; do
+                cp -a "$file" "$NEWROOT/$file"
+            done
+        )
+    done
     umount $NEWROOT/run
 fi
diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh
index 11f81219e..a113c3ff7 100755
--- a/modules.d/90dmsquash-live/module-setup.sh
+++ b/modules.d/90dmsquash-live/module-setup.sh
@@ -22,7 +22,7 @@ installkernel() {
 
 # called by dracut
 install() {
-    inst_multiple umount dmsetup blkid dd losetup grep blockdev
+    inst_multiple umount dmsetup blkid dd losetup grep blockdev find
     inst_multiple -o checkisomd5
     inst_hook cmdline 30 "$moddir/parse-dmsquash-live.sh"
     inst_hook cmdline 31 "$moddir/parse-iso-scan.sh"