X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=4c434067a29609fb21afa5d8a4b52a6be9b25465;hp=7ee50a92e53ee6dd60d74a3920239bab8ce631ab;hb=4799b75776b7b374b8a8a05e68c2bb32d380a856;hpb=dd916bb8959181ad9e54648d1cbf2fd6626c6a81

diff --git a/chroot-script b/chroot-script
index 7ee50a9..4c43406 100644
--- a/chroot-script
+++ b/chroot-script
@@ -54,7 +54,16 @@ chrootmirror() {
 # set up grml repository {{{
 grmlrepos() {
   if [ -n "$GRMLREPOS" ] ; then
-     echo 'deb     http://grml.org/repos/ ./' >> /etc/apt/sources.list
+     cat >> /etc/apt/sources.list << EOF
+# stable repository:
+  deb     http://deb.grml.org/ grml-stable  main
+  deb-src http://deb.grml.org/ grml-stable  main
+
+# testing/development repository:
+  deb     http://deb.grml.org/ grml-testing main
+  deb-src http://deb.grml.org/ grml-testing main
+'
+EOF
   fi
 }
 # }}}
@@ -96,7 +105,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
@@ -370,6 +392,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