From: Harald Hoyer <harald@redhat.com>
Date: Fri, 2 Sep 2011 17:01:16 +0000 (+0200)
Subject: dmsquash-live-root: use blkid to determine fstype of images
X-Git-Tag: 014~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=380b8b516e719e32f766ad78c88009bc589126ec;p=thirdparty%2Fdracut.git

dmsquash-live-root: use blkid to determine fstype of images

prevents:
dracut: FATAL: cannot mount live image (unknown filesystem type)
https://bugzilla.redhat.com/show_bug.cgi?id=735199
---

diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
index 90e633c4a..2b6c0e233 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root
+++ b/modules.d/90dmsquash-live/dmsquash-live-root
@@ -45,9 +45,7 @@ fi
 
 # determine filesystem type for a filesystem image
 det_img_fs() {
-    local _img="$1" _loop=$(losetup -f) _fs
-    losetup $_loop $_img; _fs=$(det_fs $_loop); losetup -d $_loop
-    echo $_fs
+    blkid -s TYPE -u noraid -o value "$1"
 }
 
 for arg in $CMDLINE; do case $arg in ro|rw) liverw=$arg ;; esac; done