rewrote kernel package version handling

diff --git a/chroot-script b/chroot-script
index 4a505ac..50d3f4f 100644 (file)
--- a/chroot-script
+++ b/chroot-script
@@ -38,6 +38,16 @@ if [ "$PACKAGES" = 'yes' ] ; then
    fi
 fi
 
+if [ -n "$KERNEL" ] ; then
+   apt-get update
+   if [ "$RELEASE" = 'sarge' ] ; then
+      KERNELPACKAGES="kernel-image-$KERNEL"
+   else
+      KERNELPACKAGES="linux-image-$KERNEL"
+   fi
+   apt-get --force-yes -y install $KERNELPACKAGES
+fi
+
 if [ -n "$RECONFIGURE" ] ; then
    for package in $RECONFIGURE ; do
        dpkg --list $package 1>/dev/null 2>/dev/null && dpkg-reconfigure $package || echo "Warning: $package does not exist, can not reconfigure it."

diff --git a/config b/config
index f8e7ded..f710c54 100644 (file)
--- a/config
+++ b/config
@@ -38,8 +38,8 @@ RELEASE='etch'
 # hostname of new system
 HOSTNAME='grml'
 
-# kernel version
-KERNEL='linux-image-686'
+# kernel version which should be installed
+KERNEL='2.6-686'
 
 # name of debootstrap executable
 # supported values: debootstrap cdebootstrap

diff --git a/packages b/packages
index 0435901..ad3d0e6 100644 (file)
--- a/packages
+++ b/packages
@@ -1,3 +1,3 @@
 locales console-data
-linux-headers-2.6-686 linux-image-2.6-686 initrd-tools grub mdadm lvm2
+initrd-tools grub mdadm lvm2
 bzip2 dhcp3-client file less lsof most pciutils resolvconf screen ssh strace sysfsutils usbutils vim w3m zsh