Adding upstream version 1.119.1.

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 504a3f4..807553a 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -34,6 +34,13 @@ get_fstype ()
        local FSTYPE
        local FSSIZE
 
+       # fstype misreports LUKS devices
+       is_luks "${1}"
+       if [ $? -eq 0 ]; then
+           /lib/udev/vol_id -t ${1} 2>/dev/null
+           return
+       fi
+
        eval $(fstype < ${1})
 
        if [ "${FSTYPE}" != "unknown" ]
@@ -306,3 +313,16 @@ get_mac ()
 
        echo ${mac}
 }
+
+is_luks()
+{
+    devname="${1}"
+    if [ -x /sbin/cryptsetup ]
+    then
+       /sbin/cryptsetup isLuks "${devname}" 2>/dev/null
+       return $?
+    else
+       return 1
+    fi
+
+}