From: Michael Prokop <mika@grml.org>
Date: Fri, 8 May 2009 13:22:20 +0000 (+0200)
Subject: Drop the 'do not prompt for partition dialog if swraid has been configured already'
X-Git-Tag: v0.27~3
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=e2272afc468270922a68d0a091ec550e8e14bb6e

Drop the 'do not prompt for partition dialog if swraid has been configured already'
---

diff --git a/debian/changelog b/debian/changelog
index d2cc370..acf4c8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,21 @@
 grml-debootstrap (0.27) unstable; urgency=low
 
-  * Support setting Debian suite components (like main, contrib,...)
-    through COMPONENTS so it's possible to use a simple 'main' mirror.
-  * 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:46:44 +0200
+  * New features:
+    - support setting Debian suite components (like main, contrib,...)
+      through COMPONENTS so it's possible to use a simple 'main' mirror.
+    - support setting aptitude/apt-get options through $DPKG_OPTIONS.
+    - support selection of netinstall vs. local mirror in interactive menu
+  * Bugfixes:
+    - make sure to ignore /dev/md* devices if not using SW-RAID
+    - do not fail in chrootmirror() when using $ISO variable.
+    - change order of checkconfiguration() so we get the prompt/
+      display for checking configuration again.
+    - Drop 'do not prompt for partition dialog if swraid has been
+      configured already' which doesn't make any sense in most situations
+  * Debian Package:
+    - bump Standard Version to 3.8.1 (no further changes).
+
+ -- Michael Prokop <mika@grml.org>  Fri, 08 May 2009 15:19:15 +0200
 
 grml-debootstrap (0.26) unstable; urgency=low
 
diff --git a/grml-debootstrap b/grml-debootstrap
index 59d89b4..26ddbf7 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -514,8 +514,7 @@ interactive_mode()
 
   prompt_for_swraid
 
-  # do not prompt for partition dialog if swraid has been configured already
-  [ -n "$TARGET" ] || prompt_for_target
+  prompt_for_target
 
   prompt_for_bootmanager