rootfs-block/mount-root.sh: fixed filesystem type udev parsing
authorHarald Hoyer <harald@redhat.com>
Wed, 10 Nov 2010 19:12:05 +0000 (20:12 +0100)
committerHarald Hoyer <harald@redhat.com>
Wed, 10 Nov 2010 19:12:05 +0000 (20:12 +0100)
modules.d/95rootfs-block/mount-root.sh

index bc17848..b242acf 100755 (executable)
@@ -97,14 +97,15 @@ if [ -n "$root" -a -z "${root%%block:*}" ]; then
 
     umount "$NEWROOT"
     if [ "$rootfs" = "auto" ]; then
-        udevadm info --query=env --name=${root#block:} | \
+        rootfs=$(udevadm info --query=env --name=${root#block:} | \
             while read line; do
                 if strstr $line ID_FS_TYPE; then
                     eval $line
-                    rootfs=$ID_FS_TYPE
+                    echo $ID_FS_TYPE
                     break
                 fi
-            done
+            done)
+        rootfs=${rootfs:-auto}
     fi
 
     # backslashes are treated as escape character in fstab