[master 1/1] anaconda-dracut: Fix sysroot mount for netroot (#1232411)

bcl installerbot-noreply at redhat.com
Tue Jun 30 19:39:15 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

Add anaconda_mount_sysroot function and use it everywhere that
dmsquash-live-root is called.
---
 dracut/anaconda-lib.sh     | 5 +++++
 dracut/anaconda-netroot.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh
index 0148118..c28a28e 100755
--- a/dracut/anaconda-lib.sh
+++ b/dracut/anaconda-lib.sh
@@ -97,6 +97,11 @@ anaconda_live_root_dir() {
         umount $repodir
         [ -n "$iso" ] && umount $isodir
     fi
+    anaconda_mount_sysroot $img
+}
+
+anaconda_mount_sysroot() {
+    local img="$1"
     if [ -e "$img" ]; then
         /sbin/dmsquash-live-root $img
         # dracut & systemd only mount things with root=live: so we have to do this ourselves
diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh
index 8ceaffe..742ee98 100755
--- a/dracut/anaconda-netroot.sh
+++ b/dracut/anaconda-netroot.sh
@@ -77,7 +77,7 @@ case $repo in
             [ -n "$updates" ] && unpack_updates_img $updates /updates
             product=$(fetch_url $repo/images/product.img)
             [ -n "$product" ] && unpack_updates_img $product /updates
-            /sbin/dmsquash-live-root $runtime
+            anaconda_mount_sysroot $runtime
         else
             warn "Could not retrieve stage2 image from $repo using $netif"
         fi


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/b19df2e032971683b783d7775a104021731548c3


More information about the anaconda-patches mailing list