Merging casper 1.174.

[live-boot-grml.git] / scripts / live-helpers

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 1b4286d..0cdc755 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -81,11 +81,7 @@ get_fstype ()
        then
                /lib/udev/vol_id -t ${1} 2>/dev/null
        else
-               eval $(blkid -o udev "${1}")
-               if [ -n "$ID_FS_TYPE" ]
-               then
-                       echo "${ID_FS_TYPE}"
-               fi
+               /sbin/blkid -s TYPE -o value $1 2>/dev/null
        fi
 }
 
@@ -352,8 +348,7 @@ find_cow_device ()
                                        return 0
                                fi
                        else
-                               eval $(blkid -o udev "${devname}")
-                               if [ "$ID_FS_LABEL" = "${pers_label}" ]
+                               if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
                                then
                                        echo "${devname}"
                                        return 0