X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=72ff57d0948d2b2f8ad30bfbab1fb8911abf3629;hb=e49533949a1777148b5293ca8594413416b786de;hp=f6de36bbe881c812c4db402ce6b92089f8237874;hpb=0844fd956f409197b47b3d263ddc54c310cf892b;p=grml-debootstrap.git diff --git a/grml-debootstrap b/grml-debootstrap index f6de36b..72ff57d 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -11,7 +11,7 @@ set -e # exit on any error # variables {{{ PN="$(basename $0)" -VERSION='0.34' +VERSION='0.35' MNTPOINT="/mnt/debootstrap.$$" # inside the chroot system locales might not be available, so use minimum: @@ -210,7 +210,7 @@ prompt_for_target() 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 \ @@ -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 - 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 \