From: Michael Prokop <mika@grml.org>
Date: Fri, 8 May 2009 12:47:31 +0000 (+0200)
Subject: Bugfix: change order of checkconfiguration()
X-Git-Tag: v0.27~6
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=8c6b63a991f3c158f050f7dea4e3c842804cf5cc

Bugfix: change order of checkconfiguration()
---

diff --git a/debian/changelog b/debian/changelog
index aaf9be7..d2cc370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,11 @@ grml-debootstrap (0.27) unstable; urgency=low
   * Support setting aptitude/apt-get options through $DPKG_OPTIONS.
   * Bugfix: make sure to ignore /dev/md* devices if not using SW-RAID
   * Bugfix: do not fail in chrootmirror() when using $ISO variable.
+  * Bugfix: change order of checkconfiguration() so we get the prompt/
+    display for checking configuration again.
   * Bump Standard Version to 3.8.1 (no further changes).
 
- -- Michael Prokop <mika@grml.org>  Fri, 08 May 2009 14:28:27 +0200
+ -- Michael Prokop <mika@grml.org>  Fri, 08 May 2009 14:46:44 +0200
 
 grml-debootstrap (0.26) unstable; urgency=low
 
diff --git a/grml-debootstrap b/grml-debootstrap
index a08262a..66e4398 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -425,6 +425,19 @@ fi
 }
 # }}}
 
+# user should recheck his configuration {{{
+# support full automatic installation:
+checkforrun() {
+   dialog --timeout 10 --title "$PN" \
+          --yesno "Do you want to stop at this stage?
+
+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
+}
+
 # make sure the user is aware of the used configuration {{{
 checkconfiguration()
 {
@@ -510,8 +523,6 @@ interactive_mode()
   fi
 
   prompt_for_mirror
-
-  checkconfiguration
 }
 
 # run interactive mode if we didn't get the according configuration yet
@@ -522,6 +533,8 @@ if [ -z "$TARGET" -o -n "$INTERACTIVE" ] ; then
 fi
 # }}}
 
+checkconfiguration
+
 # finally make sure at least $TARGET is set [the partition for the new system] {{{
 if [ -n "$TARGET" ] ; then
    SHORT_TARGET="${TARGET##*/}"
@@ -643,19 +656,6 @@ stage() {
 }
 # }}}
 
-# user should recheck his configuration {{{
-# support full automatic installation:
-checkforrun() {
-   dialog --timeout 10 --title "$PN" \
-          --yesno "Do you want to stop at this stage?
-
-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
-}
-
 # create filesystem {{{
 mkfs() {
   if [ -n "$MKFS" ] ; then