X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=604f617949fcf693044acfc82e70a780e2ecd4db;hp=cb90ebef95068c3a9904d865426ddd7bf578f4d8;hb=fb3f3f9172d5f724371023dc302ebedce399ec04;hpb=03a19d66489c0cd75e72b57d3f49c2f01dc42b04

diff --git a/chroot-script b/chroot-script
index cb90ebe..604f617 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: Fre Nov 03 22:27:09 CET 2006 [mika]
+# Latest change: Fre Nov 03 23:42:36 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -14,7 +14,7 @@ set -e # exit on any error
 [ -r /proc/1 ] || mount -t proc   none /proc
 
 if [ -n "$CHROOTMIRROR" ] ; then
-   echo "$CHROOTMIRROR" > /etc/apt/sources.list
+   echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
 fi
 
 if ! [ -r /etc/kernel-img.conf ] ; then
@@ -27,6 +27,12 @@ do_symlinks = Yes
 EOF
 fi
 
+# create default devices
+if ! [ -r /dev/hda20 ] ; then
+   echo "Creating generic devices in /dev - this might take a while..."
+   cd /dev && MAKEDEV generic
+fi
+
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then
@@ -34,8 +40,23 @@ 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)
+   fi
+fi
+
+# sarge specific stuff
+if [ "$RELEASE" = 'sarge' ] ; then
+   sed -i "s/ROOT=probe/ROOT=$TARGET/" /etc/mkinitrd/mkinitrd.conf
+fi
+
+if [ -n "$KERNEL" ] ; then
+   apt-get update
+   if [ "$RELEASE" = 'sarge' ] ; then
+      KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL"
+   else
+      KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL"
    fi
+   apt-get --force-yes -y install $KERNELPACKAGES
 fi
 
 if [ -n "$RECONFIGURE" ] ; then
@@ -104,12 +125,6 @@ if [ -n "$HOSTNAME" ] ; then
    echo "$HOSTNAME" > /etc/hostname
 fi
 
-# create default devices
-if ! [ -r /dev/hda20 ] ; then
-   echo "Creating generic devices in /dev - this might take a while..."
-   cd /dev && MAKEDEV generic
-fi
-
 # assume the first available kernel as our main kernel
 KERNELIMG=$(ls -1 /boot/vmlinuz-* | head -1)
 KERNELVER=${KERNELIMG#/boot/vmlinuz-}