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

diff --git a/chroot-script b/chroot-script
index 7192cdc..ea845d1 100644
--- a/chroot-script
+++ b/chroot-script
@@ -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 ""
 
@@ -132,7 +133,7 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 # generate initrd
 if [ -n "$INITRD" ] ; then
    if [ "$RELEASE" = 'sarge' ] ; then
-      einfo "Release sarge detected, will not create an initrd."
+      echo "Release sarge detected, will not create an initrd."
       return 0
    fi
    echo "Generating initrd."
@@ -148,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