Fix for wrong parsing of blkid output

cernvm · May 9, 2014 · fa25d9f · fa25d9f
1 parent e076fa3
commit fa25d9f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/hepix/extra/hepix_functions b/hepix/extra/hepix_functions
@@ -86,7 +86,11 @@ getResourcesFromCD() {
     for dev in /dev/sr{0,1} /dev/{xv,v,h,s}d{c,d,b}{,1}; do
         if [ -e "${dev}" ] ; then
             rdisk=$dev
-            fstype=$(blkid $rdisk | awk '{print $4}' | sed s/TYPE=// | tr -d \")
+
+            # Extract filesystem type of device
+            fstype=$( blkid $rdisk | grep -o -E 'TYPE="[0-9a-zA-Z]+' )
+            fstype=${fstype:6}
+
             if [ "x$fstype" = "xiso9660" -o "x$fstype" = "xvfat" ]; then
               logger -t $0 "Attempting to mount contextualization image from $rdisk"