X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=7f2669ad986af3f1bdaa4f829492b18f5c220818;hp=6692cbb61d44d9693a6be7c7a871b5ae21c316d2;hb=fe903287fed5cccc7d382751fe745f5984dc6e37;hpb=809a77ba79fca593a137f1d2c6a2ac8408ebfa04

diff --git a/chroot-script b/chroot-script
index 6692cbb..7f2669a 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 23:39:35 CET 2006 [mika]
+# Latest change: Fre Nov 03 23:42:36 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -46,7 +46,7 @@ fi
 
 # sarge specific stuff
 if [ "$RELEASE" = 'sarge' ] ; then
-   sed -i "s/ROOT=probe/ROOT=$TARGET" /etc/mkinitrd/mkinitrd.conf
+   sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf
 fi
 
 if [ -n "$KERNEL" ] ; then
@@ -131,6 +131,10 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 
 # generate initrd
 if [ -n "$INITRD" ] ; then
+   if [ "$RELEASE" = 'sarge' ] ; then
+      einfo "Release sarge detected, will not create an initrd."
+      return 0
+   fi
    echo "Generating initrd."
    update-initramfs -c -t -k $KERNELVER
    if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
@@ -144,7 +148,12 @@ if [ -n "$GROOT" ] ; then
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
-   cp /usr/lib/grub/i386-pc/* /boot/grub/
+   if [ -d /usr/lib/grub/i386-pc/ ] ; then
+      cp /usr/lib/grub/i386-pc/* /boot/grub/
+   else
+      # sarge ships grub files in another directory
+      cp /lib/grub/i386-pc/* /boot/grub/
+   fi
 
    # finally install grub
    update-grub -y