add intial support for grml-repos

diff --git a/TODO b/TODO
index 6828d1d..88a649f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,12 +1,11 @@
 TODO list for grml-debootstrap
 ------------------------------
 
-* support installation into directories as well (not only /dev/ice)
 * support tarballs for customization
 * support automatic installation of grml packages:
   * grml-etc-core
   * grml-x + xserver-xorg
 * support *full* automatic installation where not a single keypress is necessary
   -> support bootoption debian2hd for installation through bootoption on live-cd
-* support for LVM + SW-RAID
+* support for LVM + SW-RAID [should work through installation into directory, needs testing though]
 * should we support mkinitrd for initrd creation in sarge?

diff --git a/chroot-script b/chroot-script
index deb7b7a..662365d 100644 (file)
--- 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 15:33:28 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
 

diff --git a/config b/config
index 9355f27..507eeb1 100644 (file)
--- a/config
+++ b/config
@@ -3,7 +3,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: Fre Nov 17 22:58:32 CET 2006 [mika]
+# Latest change: Sam Nov 18 10:32:30 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
@@ -50,6 +50,14 @@ MIRROR='ftp://ftp.debian.de/debian'
 # if empty then any existing /etc/apt/sources.list will be taken
 CHROOTMIRROR='ftp://ftp.debian.de/debian'
 
+# add grml repository to /etc/apt/sources.list
+# if empty then the repository won't be added
+GRMLREPOS='yes'
+
+# install packages from grml-pool? requires activated $GRMLREPOS from above
+# if empty nothing will be added
+GRMLPACKAGES='grml-etc-core'
+
 # release (which Debian version should be installed)
 # supported values: sarge etch sid
 RELEASE='etch'