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

diff --git a/chroot-script b/chroot-script
index 7f2669a..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 ""
 
@@ -132,14 +133,14 @@ 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
-      GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
-      LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+      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