X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=a75f34b99989964a14beac1d4734a30d26111fca;hp=d4ebff25c6b107e718fb420b290cb087529f691d;hb=b3015dae12151f5eb85e60002a5c20d1678a1059;hpb=85fb3ef27157d4110482553454751e5da33afecd

diff --git a/chroot-script b/chroot-script
index d4ebff2..a75f34b 100644
--- 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
@@ -336,7 +349,7 @@ grub() {
      $UPDATEGRUB -y
      if [ -f /boot/grub/menu.lst ] ; then
         sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
-        sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro|g" /boot/grub/menu.lst
+        sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
         # not sure why savedefault does not work for me; any ideas?
         sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
         $UPDATEGRUB -y
@@ -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 extrapackages  && extrapackages  && stage extrapackages done
   stage mkinitrd       && mkinitrd       && stage mkinitrd done
   stage kernel         && kernel         && stage kernel done
   stage reconfigure    && reconfigure    && stage reconfigure done