probepart: fix for extended partitions

puppylinux-woof-CE · Jan 19, 2017 · ae59b22 · ae59b22
1 parent 5f538fe
commit ae59b22
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/woof-code/rootfs-skeleton/sbin/probepart b/woof-code/rootfs-skeleton/sbin/probepart
@@ -76,10 +76,11 @@ do
    fi
  fi
 
- FSTYPE="`blkid /dev/$ONEDEV 2>/dev/null`"
- FSTYPE=${FSTYPE##* TYPE=\"} #remove *.TYPE="
- FSTYPE=${FSTYPE%%\"*}      #remove ".*
- [ "$FSTYPE" = "" ] && FSTYPE="unknown"
+ FSTYPE="$(blkid /dev/$ONEDEV 2>/dev/null | grep -o ' TYPE=.*' | cut -f 2 -d '"')"
+ if [ "$FSTYPE" = "" ] ; then
+   [ "$SIZE" = "2" ] && continue #extended partition (most likely)
+   FSTYPE="unknown"
+ fi
 
  if [ "$FSTYPE" = "unknown" -a "$OPTICAL" = "yes" ];then # probe optical a bit more.
    cddetect -q -d/dev/${ONEDEV} > /dev/null 2>&1