X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=662365d317a22a6d010386e135651c8e4a648a32;hp=c4d809a7a7d40492347bb33ee96bb1cfb0b2e43b;hb=60a9691e1df16b1204cb5f39307ea63a8c643681;hpb=c454134fe106e0643e28a306366e00866acf5890

diff --git a/chroot-script b/chroot-script
index c4d809a..662365d 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Nov 06 12:31:50 CET 2006 [mika]
+# Latest change: Sam Nov 18 10:32:33 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,6 +17,10 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
 fi
 
+if [ -n "$GRMLREPOS" ] ; then
+   echo 'deb     http://grml.org/repos/ ./' >> /etc/apt/sources.list
+fi
+
 if ! [ -r /etc/kernel-img.conf ] ; then
    echo "Setting up /etc/kernel-img.conf"
    cat > /etc/kernel-img.conf << EOF
@@ -40,7 +44,7 @@ if [ "$PACKAGES" = 'yes' ] ; then
      exit 1
    else
      apt-get update
-     apt-get --force-yes -y install $(cat /etc/debootstrap/packages)
+     apt-get --force-yes -y install $(cat /etc/debootstrap/packages) $GRMLPACKAGES
    fi
 fi
 
@@ -145,8 +149,10 @@ if [ -n "$INITRD" ] ; then
    fi
 fi
 
-if [ -n "$GROOT" ] ; then
-   echo "Installing grub"
+if [ -z "$GROOT" ] ; then
+   echo "Warning: \$GROOT is not defined, can not adjust grub configuration therefor."
+else
+   echo "Adjusting grub configuration for use on ${GROOT}."
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub