From a1337d3aeb7bc042fb40fb90315264867661d3fc Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 22 Feb 2010 23:34:30 +0100
Subject: [PATCH] Introduce option --nopackages

---
 cmdlineopts.clp        |  3 +++
 debian/changelog       | 10 +++++++---
 grml-debootstrap       |  1 +
 grml-debootstrap.8.txt |  4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cmdlineopts.clp b/cmdlineopts.clp
index dd88afb..5f144a5 100644
--- a/cmdlineopts.clp
+++ b/cmdlineopts.clp
@@ -50,6 +50,9 @@ while :; do
   --nodebootstrap)     # Skip debootstrap, only do configuration to the target
     _opt_nodebootstrap=T
     ;;
+  --nopackages)        # Skip installation of packages defined in /etc/debootstrap/packages
+    _opt_nopackages=T
+    ;;
   --arch)              # Target architecutre
     shift; _opt_arch="$1"
     ;;
diff --git a/debian/changelog b/debian/changelog
index 32e4b2e..a251f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 grml-debootstrap (0.34) unstable; urgency=low
 
-  * Move the apt cache removal function to the end to avoid failure
-    of grub installation.
+  * Move the apt cache removal function to a later point of execution
+    so custom scripts still have access to the Debian packages.
   * Display executed debootstrap cmdline when running it.
   * Slightly improve checks for grub-install/update-grub and do
     no set full path to the binaries.
+  * Revert "Updated grml-debootstrap parameter handling" which
+    breaks the way grml-debootstrap used to work. Instead:
+  * Introduce option --nopackages to skip installation of packages
+    defined in /etc/debootstrap/packages.
 
- -- Michael Prokop <mika@grml.org>  Mon, 22 Feb 2010 22:30:19 +0100
+ -- Michael Prokop <mika@grml.org>  Mon, 22 Feb 2010 23:33:54 +0100
 
 grml-debootstrap (0.33) unstable; urgency=low
 
diff --git a/grml-debootstrap b/grml-debootstrap
index 2e386bf..bdc326c 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -140,6 +140,7 @@ fi
 [ "$_opt_interactive" ]         && INTERACTIVE=1
 [ "$_opt_config" ]              && CONFIGFILE=$_opt_config
 [ "$_opt_packages_set" ]        && PACKAGES='yes'
+[ "$_opt_nopackages" ]          && PACKAGES=''
 [ "$_opt_debconf_set" ]         && DEBCONF='yes'
 [ "$_opt_scripts_set" ]         && SCRIPTS='yes'
 [ "$_opt_pre_scripts_set" ]     && PRE_SCRIPTS='yes'
diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index b9e0349..d00575e 100644
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -103,6 +103,10 @@ Options and environment variables
 
     Skip debootstrap, only do configuration to the target.
 
+*--nopackages*::
+
+    Skip installation of packages defined in /etc/debootstrap/packages.
+
 *--insecure*::
 
     Do not download and check signatures for retrieved Release files.
-- 
2.1.4