X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=43f19ed06f8c999568543f36078e731a645a2d0b;hp=16e1e2d5c02a11751e7779b341d6f2fd7f8e3dda;hb=ed31724625a40d9d38f084e384c253d9373ef7c7;hpb=301721cec809fe020147a0c999e593ee81bbb98e

diff --git a/grml-debootstrap b/grml-debootstrap
index 16e1e2d..43f19ed 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Wed Aug 27 02:41:00 CEST 2008 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
@@ -152,8 +151,8 @@ done
 # welcome screen {{{
 welcome_dialog()
 {
-   dialog --title "$PN" --msgbox "Welcome to the interactive configuration of grml-debootstrap." 0 0
-   # TODO: improve message
+   dialog --title "$PN" --yesno "Welcome to the interactive configuration of ${PN}.
+Do you want to continue installing Debian using this frontend?" 0 0
 }
 # }}}
 
@@ -289,7 +288,7 @@ RAIDLEVEL=$(dialog --stdout --title "$PN" --default-item raid1 \
 [ $? -eq 0 ] || bailout 20
 
 MD_LIST=$(for i in $(seq 0 9) ; do
-            awk '{print $4}' /proc/partitions | grep md$i /proc/partitions  || \
+            awk '{print $4}' /proc/partitions | grep -q md$i || \
             echo "/dev/md$i /dev/md$i"
           done)
 
@@ -305,26 +304,45 @@ AVAILABLE_PARTITIONS=$(LANG=C fdisk -l 2>/dev/null | \
              grep -v 'Extended$' | \
              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 $i off" ; done)
+PARTITION_LIST=$(for i in $(echo $AVAILABLE_PARTITIONS) ; do
+                     echo "$i $(vol_id --type $i 2>/dev/null || echo [no_filesystem_yet]) off"
+                 done)
 
 dialog --title "$PN" \
        --single-quoted \
        --checklist "Please select the partitions you would like to use for your $RAIDLEVEL on ${TARGET}:" 0 0 0 \
        $PARTITION_LIST 2>$TMPFILE
 RETVAL=$?
-SELECTED_PARTITIONS=$(cat $TMPFILE)
+SELECTED_PARTITIONS="$(cat $TMPFILE)"
 
 NUM_PARTITIONS=0
 for i in $(cat $TMPFILE) ; do
-  NUM_PARTITIONS=$(($NUM_PARTITIONS+1))
+   NUM_PARTITIONS=$((${NUM_PARTITIONS}+1))
 done
 
-echo "
-Debug:
+ERRORFILE=$(mktemp)
+set +e
+# TODO: better error handling?
+yes | mdadm --create "${TARGET}" --level="${RAIDLEVEL}" \
+      --raid-devices="${NUM_PARTITIONS}" ${SELECTED_PARTITIONS} 1>/dev/null 2>$ERRORFILE
+RC=$?
+set -e
+
+if [ "$RC" = 0 ] ; then
+   dialog --title "$PN" --msgbox \
+   "Creating $TARGET was successful." 0 0
+   rm -f "$TMPFILE" "$ERRORFILE"
+else
+   dialog --title "$PN" --msgbox \
+   "There was an error setting up $TARGET:
+
+$(cat $ERRORFILE)
+
+Exiting." 0 0
+   rm -f "$TMPFILE" "$ERRORFILE"
+   exit 1
+fi
 
-mdadm --create --verbose $TARGET --level=$RAIDLEVEL
-      --raid-devices=$NUM_PARTITIONS $SELECTED_PARTITIONS
-"
 }
 
 prompt_for_swraid()
@@ -332,9 +350,7 @@ prompt_for_swraid()
 if dialog --stdout --title "$PN" \
           --defaultno --yesno "Do you want to configure Software RAID?
 
-Notice: currently only RAID levels 1 and 5 are
-supported by ${PN}. Configuration will be
-take place using mdadm." 0 0 ; then
+Please notice that currently only RAID levels 1 and 5 are supported by ${PN}. Configuration will take place using mdadm." 0 0 ; then
   config_swraid_setup
 fi
 }
@@ -352,6 +368,7 @@ interactive_mode()
 
   prompt_for_bootmanager
 
+  # FIXME: there seems to be a problem with grubdevice if it's /dev/md*
   [ -n "$BOOT_PARTITION" ] && GRUB="$(grubdevice $BOOT_PARTITION)"
   [ -n "$TARGET" ]         && GROOT="$(grubdevice $TARGET)"
 
@@ -501,8 +518,8 @@ checkforrun() {
    dialog --timeout 10 --title "$PN" \
           --yesno "Do you want to stop at this stage?
 
-Notice: you are running grml-debootstrap in non-interactive mode.
-grml-debootstrap will install Debian ${RELEASE} on ${TARGET}.
+Notice: you are running ${PN} in non-interactive mode.
+${PN} will install Debian ${RELEASE} on ${TARGET}.
 Last chance to quit. Timeout of 10 seconds running....
 
 Do you want to stop now?" 0 0 2>/dev/null
@@ -705,10 +722,9 @@ done
 # end dialog of autoinstallation {{{
 if [ -n "$AUTOINSTALL" ] ; then
    dialog --title "$PN" --msgbox \
-          "Finished execution of ${0}.
-Enjoy your Debian system." 6 60
+          "Finished execution of ${PN}. Enjoy your Debian system." 0 0
 else
-   einfo "Finished execution of $PN - enjoy your Debian system." ; eend 0
+   einfo "Finished execution of ${PN}. Enjoy your Debian system." ; eend 0
 fi
 # }}}