From: Michael Prokop <devnull@localhost>
Date: Mon, 15 Sep 2008 17:46:43 +0000 (+0200)
Subject: Display meaningful information when no partitions could be found
X-Git-Tag: 0.22
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=43dac4ce09bbfb4ae4d417e8951345820e9393b8

Display meaningful information when no partitions could be found
---

diff --git a/debian/changelog b/debian/changelog
index 9d199f0..a1ac50f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-debootstrap (0.22) unstable; urgency=low
+
+  * Display meaningful information when no partitions could be found.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 15 Sep 2008 19:46:20 +0200
+
 grml-debootstrap (0.21) unstable; urgency=low
 
   * Make sure it works on target directories also if they are
diff --git a/grml-debootstrap b/grml-debootstrap
index 6aefe5d..870b8a8 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -11,7 +11,7 @@ set -e # exit on any error
 
 # variables {{{
 PN="$(basename $0)"
-VERSION='0.21'
+VERSION='0.22'
 MNTPOINT="/mnt/debootstrap.$$"
 
 # inside the chroot system locales might not be available, so use minimum:
@@ -169,7 +169,14 @@ prompt_for_target()
                grep -v 'Extended$' | \
                gawk -v num=0 -v ORS=' ' '/^\/dev\// {print $1}')
 
-  [ -n "$AVAILABLE_PARTITIONS" ] || echo "FIXME: no partitions available?"
+  if [ -z "$AVAILABLE_PARTITIONS" ] ; then
+     dialog --title "$PN" --single-quoted --stdout \
+     --msgbox "Sorry, no partitions found. Please configure your
+     harddisks (see /proc/partitions) using a tool like fdisk,
+     cfdisk, gpart, gparted,..." 0 0
+     exit 0
+  fi
+
   PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do
                        echo "$i $(vol_id --type $i 2>/dev/null || echo [no_filesystem_yet])"
                    done)
@@ -718,7 +725,7 @@ preparechroot() {
   [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES
   [ -n "$TARGET" ]       && echo "TARGET=$TARGET"             >> $CHROOT_VARIABLES
   [ -n "$TARGET_UUID" ]  && echo "TARGET_UUID=$TARGET_UUID"   >> $CHROOT_VARIABLES
-  
+
   cp $CONFFILES/chroot-script $MNTPOINT/bin/chroot-script
   chmod 755 $MNTPOINT/bin/chroot-script
   mkdir $MNTPOINT/etc/debootstrap/