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

diff --git a/chroot-script b/chroot-script
index 604f617..ea845d1 100644
--- 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
@@ -69,6 +69,7 @@ fi
 echo "Activating shadow passwords."
 shadowconfig on
 echo "Setting password for user root:"
+# TODO: typing the wrong password will exit chroot script
 passwd
 echo ""
 
@@ -131,6 +132,10 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 
 # generate initrd
 if [ -n "$INITRD" ] ; then
+   if [ "$RELEASE" = 'sarge' ] ; then
+      echo "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 +149,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