X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=chroot-script;h=620a2c6aad9fed18b59df2053e1506ca6d495a79;hb=df215113c0cc97a0b7b66186c4eec5ba991fde10;hp=ea845d142c0c112074d8391d9be4dba9def64944;hpb=687068e816c608239edf287210beb1d73f08efda;p=grml-debootstrap.git diff --git a/chroot-script b/chroot-script index ea845d1..620a2c6 100644 --- a/chroot-script +++ b/chroot-script @@ -134,13 +134,13 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-} 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 - GRUBINITRD="initrd /boot/initrd.img-$KERNELVER" - LILOINITRD=" initrd=/boot/initrd.img-$KERNELVER" + 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 @@ -158,7 +158,7 @@ if [ -n "$GROOT" ] ; then # finally install grub update-grub -y - sed -i "s/groot=.*/groot=(${GROOT})/g" /boot/grub/menu.lst + sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst # not sure why savedefault does not work for me; any ideas? sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst update-grub -y