X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=81fc13278f1555398a1aba9302dead2aeef17c31;hp=6000710c8c1d6bf1d94b086ada1f6ec355a11da2;hb=df496a76a1c9c8cd01aab9d3e4563260a8ed764e;hpb=434ed75df41fbb8d24e2315b62cc134485502d6d

diff --git a/chroot-script b/chroot-script
index 6000710..81fc132 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,12 +4,13 @@
 # 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: Die Apr 10 11:11:02 CEST 2007 [mika]
+# Latest change: Don Apr 12 11:55:23 CEST 2007 [mika]
 ################################################################################
 
 set -e # exit on any error
 
-. /etc/debootstrap/config || exit 1
+. /etc/debootstrap/config    || exit 1
+. /etc/debootstrap/variables || exit 1
 
 [ -r /proc/1 ] || mount -t proc   none /proc
 
@@ -23,7 +24,7 @@ fi
 # helper functions {{{
 stage() {
   if grep -q done "$STAGES/$1" 2>/dev/null ; then
-     echo "Notice: stage $1 has been executed already, skipping execution therefore.">&2
+     echo " * Notice: stage $1 has been executed already, skipping execution therefore."
      return 1
   else
      echo "$2" > "$STAGES/$1"
@@ -95,6 +96,15 @@ mkinitrd() {
 
 # install kernel packages {{{
 kernel() {
+  # do not override $KERNEL if set via config file
+  if [ -z "$KERNEL" ] ; then
+     if [ "$ARCH" = 'i386' ] ; then
+        KERNEL='2.6-686'
+     elif [ "$ARCH" = 'amd64' ] ; then
+        KERNEL='2.6-amd64'
+     fi
+  fi
+
   if [ -n "$KERNEL" ] ; then
      apt-get update
      if [ "$RELEASE" = 'sarge' ] ; then