Add extrapackages feature

diff --git a/chroot-script b/chroot-script
index 7ee50a9..a75f34b 100644 (file)
--- a/chroot-script
+++ b/chroot-script
@@ -96,7 +96,20 @@ packages() {
 }
 # }}}
 
 }
 # }}}
 

-# sarge specific stuff: mkinitrd {{{
+# install extra packages {{{
+extrapackages() {
+    if [ "$EXTRAPACKAGES" = 'yes' ] ; then 
+        PACKAGELIST=$(find /etc/debootstrap/extrapackages -type f -name '*.deb')
+        if [ -n "$PACKAGELIST" ]; then
+            dpkg -i $PACKAGELIST
+            # run apt again to resolve any deps 
+            DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL
+        fi
+    fi
+}
+# }}}
+
+#  sarge specific stuff: mkinitrd {{{

 mkinitrd() {
   if [ "$RELEASE" = 'sarge' ] ; then
      sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf
 mkinitrd() {
   if [ "$RELEASE" = 'sarge' ] ; then
      sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf


@@ -370,6 +383,7 @@ finalize() {
   stage kernelimg_conf && kernelimg_conf && stage kernelimg_conf done
   stage makedev        && makedev        && stage makedev done
   stage packages       && packages       && stage packages done
   stage kernelimg_conf && kernelimg_conf && stage kernelimg_conf done
   stage makedev        && makedev        && stage makedev done
   stage packages       && packages       && stage packages done

+  stage extrapackages  && extrapackages  && stage extrapackages done

   stage mkinitrd       && mkinitrd       && stage mkinitrd done
   stage kernel         && kernel         && stage kernel done
   stage reconfigure    && reconfigure    && stage reconfigure done
   stage mkinitrd       && mkinitrd       && stage mkinitrd done
   stage kernel         && kernel         && stage kernel done
   stage reconfigure    && reconfigure    && stage reconfigure done

diff --git a/config b/config
index 9467498..979f574 100644 (file)
--- a/config
+++ b/config
@@ -98,6 +98,9 @@ DEBIAN_FRONTEND='noninteractive'
 # install packages defined in /etc/debootstrap/packages?
 PACKAGES='yes'
 
 # install packages defined in /etc/debootstrap/packages?
 PACKAGES='yes'
 

+# install extra packages in /etc/debootstrap/
+EXTRAPACKAGES='yes'
+

 # place of config files for debootstrap
 CONFFILES='/etc/debootstrap/'
 
 # place of config files for debootstrap
 CONFFILES='/etc/debootstrap/'
 

diff --git a/debian/changelog b/debian/changelog
index a2ac987..29e3318 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-debootstrap (0.9) unstable; urgency=low
+
+  * Add support for EXTRAPACKAGES that can be dropped in
+    /etc/debootstrap/extrapackages
+  * Add boot_append option to manpage
+  * Manpage reformatted  
+
+ -- Alexander Wirt <formorer@debian.org>  Sun, 22 Apr 2007 12:35:32 +0200
+

 grml-debootstrap (0.8) unstable; urgency=low
 
   * Add BOOT_APPEND option for kernel appendline 
 grml-debootstrap (0.8) unstable; urgency=low
 
   * Add BOOT_APPEND option for kernel appendline 

diff --git a/debian/rules b/debian/rules
index 61191f9..b07d6fc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k 
        dh_testdir
        dh_testroot
        dh_clean -k 

-       dh_installdirs etc/debootstrap usr/sbin # etc/zsh/completion.d
+       dh_installdirs etc/debootstrap usr/sbin etc/debootstrap/extrapackages # etc/zsh/completion.d

 
        # Add here commands to install the package into debian/grml-debootstrap.
        install -m 644 config           debian/grml-debootstrap/etc/debootstrap/
 
        # Add here commands to install the package into debian/grml-debootstrap.
        install -m 644 config           debian/grml-debootstrap/etc/debootstrap/

diff --git a/grml-debootstrap b/grml-debootstrap
index d4451cb..7244fbb 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -309,6 +309,8 @@ preparechroot() {
   cp /etc/debootstrap/packages        $MNTPOINT/etc/debootstrap/packages
   cp /etc/debootstrap/variables       $MNTPOINT/etc/debootstrap/variables
 
   cp /etc/debootstrap/packages        $MNTPOINT/etc/debootstrap/packages
   cp /etc/debootstrap/variables       $MNTPOINT/etc/debootstrap/variables
 

+  cp -a /etc/debootstrap/extrapackages/ $MNTPOINT/etc/debootstrap/
+

   # make sure we can access network [relevant for cdebootstrap]
   [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
 
   # make sure we can access network [relevant for cdebootstrap]
   [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf