Do not display mountpoint if we are using the default one

diff --git a/debian/changelog b/debian/changelog
index 09ab595..294a63a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ grml-debootstrap (0.29) UNRELEASED; urgency=low
     calculation problem when installing to /dev/cciss/c0d0*. Thanks!
   * Use ls for locating /dev/md* devices instead of echo so we don't
     have '/dev/md*' in the interactive partition dialog.
     calculation problem when installing to /dev/cciss/c0d0*. Thanks!
   * Use ls for locating /dev/md* devices instead of echo so we don't
     have '/dev/md*' in the interactive partition dialog.

+  * Do not display mountpoint if we are using the default one.

 
 

- -- Michael Prokop <mika@grml.org>  Wed, 08 Jul 2009 02:38:45 +0200
+ -- Michael Prokop <mika@grml.org>  Wed, 08 Jul 2009 22:33:29 +0200

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

diff --git a/grml-debootstrap b/grml-debootstrap
index 3c55932..8cafe54 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -509,14 +509,19 @@ else # if not running automatic installation display configuration and prompt fo
    einfo "$PN - Please recheck configuration before execution:"
    echo
    echo "   Target:          $TARGET"
    einfo "$PN - Please recheck configuration before execution:"
    echo
    echo "   Target:          $TARGET"

-      case "$MNTPOINT" in "$TARGET") ;; *) echo "   Mount point:     $MNTPOINT" ;; esac
-      [ -n "$GRUB" ]     && echo "   Install grub:    $GRUB" || echo "   Install grub:    no"
-      [ -n "$RELEASE" ]  && echo "   Using release:   $RELEASE"
-      [ -n "$MIRROR" ]   && echo "   Using mirror:    $MIRROR"
-      [ -n "$HOSTNAME" ] && echo "   Using hostname:  $HOSTNAME"
-      [ -n "$ISO" ]      && echo "   Using ISO:       $ISO"
-      case "$MNTPOINT" in "$TARGET") ;; *) echo "   Important! Continuing will delete all data from ${TARGET}!" ;; esac
-      echo
+
+   # do not display if MNTPOINT is the default one
+   case "$MNTPOINT" in /mnt/debootstrap*) ;; *) echo "   Mount point:     $MNTPOINT" ;; esac
+
+   [ -n "$GRUB" ]     && echo "   Install grub:    $GRUB" || echo "   Install grub:    no"
+   [ -n "$RELEASE" ]  && echo "   Using release:   $RELEASE"
+   [ -n "$MIRROR" ]   && echo "   Using mirror:    $MIRROR"
+   [ -n "$HOSTNAME" ] && echo "   Using hostname:  $HOSTNAME"
+   [ -n "$ISO" ]      && echo "   Using ISO:       $ISO"
+
+   echo "   Important! Continuing will delete all data from ${TARGET}!"
+
+   echo

    einfon "Is this ok for you? [y/N] "
    read a
    if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
    einfon "Is this ok for you? [y/N] "
    read a
    if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then