X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=e6c95a787624b1e59fff16569e6aef39380a8e96;hb=4afd25452f048a5a4e0608ec7b2f3dbbbe12da0f;hp=4142beb598fd8ea9ad93916d2a95cd6a7f804a7a;hpb=e83c790d7989f0671b16c94ddfe5c2f32ea90576;p=grml-debootstrap.git

diff --git a/chroot-script b/chroot-script
index 4142beb..e6c95a7 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 ""
 
@@ -131,11 +132,15 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 
 # generate initrd
 if [ -n "$INITRD" ] ; then
-   echo "Generating initrd."
-   update-initramfs -c -t -k $KERNELVER
-   if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
-      GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
-      LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+   if [ "$RELEASE" = 'sarge' ] ; then
+      echo "Release sarge detected, will not create an initrd."
+   else
+      echo "Generating initrd."
+      update-initramfs -c -t -k $KERNELVER
+      if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
+         GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
+         LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+      fi
    fi
 fi
 
@@ -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