use /lib/grub/i386-pc/ for sarge

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 604f617..7f2669a 100644 (file)
--- a/chroot-script
+++ b/chroot-script
@@ -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