Replace vol_id command with blkid.

diff --git a/debian/changelog b/debian/changelog
index 14c0c6f..046afd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ grml-debootstrap (0.35) unstable; urgency=low
     can cause problems with installations to directories.
     Thanks for the bugreport and debugging, Tong Sun.
     [Closes: issue806]
     can cause problems with installations to directories.
     Thanks for the bugreport and debugging, Tong Sun.
     [Closes: issue806]

+  * Replace vol_id command with blkid.

 
 

- -- Michael Prokop <mika@grml.org>  Fri, 26 Feb 2010 13:27:41 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 26 Feb 2010 15:19:10 +0100

 
 grml-debootstrap (0.34) unstable; urgency=low
 
 
 grml-debootstrap (0.34) unstable; urgency=low
 

diff --git a/grml-debootstrap b/grml-debootstrap
index 4e977fd..72ff57d 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -210,7 +210,7 @@ prompt_for_target()
   fi
 
   PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do
   fi
 
   PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do

-                       echo "$i $(vol_id --type $i 2>/dev/null || echo [no_filesystem_yet])"
+                       echo "$i $(blkid -s TYPE -o value $i 2>/dev/null || echo [no_filesystem_yet])"

                    done)
 
   TARGET=$(dialog --title "$PN" --single-quoted --stdout \
                    done)
 
   TARGET=$(dialog --title "$PN" --single-quoted --stdout \


@@ -391,7 +391,7 @@ AVAILABLE_PARTITIONS=$(LANG=C fdisk -l 2>/dev/null | \
              gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}')
 [ -n "$AVAILABLE_PARTITIONS" ] || echo "FIXME: no partitions available?"
 PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do
              gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}')
 [ -n "$AVAILABLE_PARTITIONS" ] || echo "FIXME: no partitions available?"
 PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do

-                     echo "$i $(vol_id --type $i 2>/dev/null || echo [no_filesystem_yet]) off"
+                     echo "$i $(blkid -s TYPE -o value $i 2>/dev/null || echo [no_filesystem_yet]) off"

                  done)
 
 dialog --title "$PN" --separate-output \
                  done)
 
 dialog --title "$PN" --separate-output \