Bug#351912: [patch] Re: debootstrap: Please provide an "essential" variant, which just installs essential packages

[Michael Banck <mbanck@debian.org>]

tags 351912 +patch
thanks

Hi,

turned out this is really easy to do, patch attached.


cheers,

Michael

diff -Nru /tmp/4pWrD8DwPH/debootstrap-1.0.7/debian/changelog /tmp/3EnoQM777J/debootstrap-1.0.8/debian/changelog
--- /tmp/4pWrD8DwPH/debootstrap-1.0.7/debian/changelog	2007-11-14 12:16:06.000000000 +0100
+++ /tmp/3EnoQM777J/debootstrap-1.0.8/debian/changelog	2007-11-20 00:04:34.000000000 +0100
@@ -1,3 +1,11 @@
+debootstrap (1.0.8) UNRELEASED; urgency=low
+
+  * scripts/debian/sid: Add support for essential variant. 
+  * scripts/ubuntu/gutsy: Likewise.
+  * debootstrap, debootstrap.8: Document it.
+
+ -- Michael Banck <mbanck@debian.org>  Mon, 19 Nov 2007 23:58:49 +0100
+
 debootstrap (1.0.7) unstable; urgency=low
 
   * No longer include full devices tarball in udeb.
diff -Nru /tmp/4pWrD8DwPH/debootstrap-1.0.7/debootstrap /tmp/3EnoQM777J/debootstrap-1.0.8/debootstrap
--- /tmp/4pWrD8DwPH/debootstrap-1.0.7/debootstrap	2007-11-14 02:33:25.000000000 +0100
+++ /tmp/3EnoQM777J/debootstrap-1.0.8/debootstrap	2007-11-19 23:51:32.000000000 +0100
@@ -81,7 +81,8 @@
       --components=A,B,C     use packages from the listed components of the
                              archive
       --variant=X            use variant X of the bootstrap scripts
-                             (currently supported variants: buildd, fakechroot)
+                             (currently supported variants: buildd, fakechroot,
+                             essential)
       --keyring=K            check Release files against keyring K
       --no-resolve-deps      don't try to resolve dependencies automatically
 
diff -Nru /tmp/4pWrD8DwPH/debootstrap-1.0.7/debootstrap.8 /tmp/3EnoQM777J/debootstrap-1.0.8/debootstrap.8
--- /tmp/4pWrD8DwPH/debootstrap-1.0.7/debootstrap.8	2007-10-19 12:46:05.000000000 +0200
+++ /tmp/3EnoQM777J/debootstrap-1.0.8/debootstrap.8	2007-11-20 00:01:42.000000000 +0100
@@ -61,11 +61,13 @@
 to specify the entire base system than rely on this option. With this
 option set, this behaviour is disabled.
 .IP
-.IP "\fB\-\-variant=buildd|fakechroot\fP"
+.IP "\fB\-\-variant=buildd|fakechroot|essential\fP"
 Name of the bootstrap script variant to use.  Currently, the variant
 supported are buildd, which installs the build-essential packages into
-.IR TARGET
-and fakechroot, which installs the packages without root privileges.
+.IR TARGET ,
+fakechroot, which installs the packages without root privileges and 
+essential, which installs only the essential packages into 
+.IR TARGET .
 The default, with no \fB\-\-variant=X\fP argument, is to create a base
 Debian installation in
 .IR TARGET .
diff -Nru /tmp/4pWrD8DwPH/debootstrap-1.0.7/scripts/debian/sid /tmp/3EnoQM777J/debootstrap-1.0.8/scripts/debian/sid
--- /tmp/4pWrD8DwPH/debootstrap-1.0.7/scripts/debian/sid	2007-10-20 18:45:10.000000000 +0200
+++ /tmp/3EnoQM777J/debootstrap-1.0.8/scripts/debian/sid	2007-11-19 23:57:04.000000000 +0100
@@ -9,7 +9,7 @@
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd fakechroot
+variants - buildd fakechroot essential
 
 if doing_variant fakechroot; then
     test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -31,6 +31,8 @@
       base="$(get_debs Priority: important)"
     elif doing_variant buildd; then
       base="$(get_debs Build-Essential: yes)"
+    elif doing_variant essential; then
+      base=""
     fi
 
     if doing_variant fakechroot; then 
diff -Nru /tmp/4pWrD8DwPH/debootstrap-1.0.7/scripts/ubuntu/gutsy /tmp/3EnoQM777J/debootstrap-1.0.8/scripts/ubuntu/gutsy
--- /tmp/4pWrD8DwPH/debootstrap-1.0.7/scripts/ubuntu/gutsy	2007-10-20 18:45:10.000000000 +0200
+++ /tmp/3EnoQM777J/debootstrap-1.0.8/scripts/ubuntu/gutsy	2007-11-19 23:58:00.000000000 +0100
@@ -9,7 +9,7 @@
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd fakechroot
+variants - buildd fakechroot essential
 
 if doing_variant fakechroot; then
     test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -27,7 +27,7 @@
       base="$(get_debs Priority: important)"
     elif doing_variant buildd; then
       base="$(get_debs Build-Essential: yes)"
-    elif doing_variant fakechroot; then
+    elif doing_variant fakechroot || doing_variant essential; then
       base="apt"
     fi
 }