X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=5ca8295500bbffc85d89d8d18b7e613a94a0aba2;hp=3650c6f7cfa98fbb2d8a38b9e52495aad5cd9176;hb=3d63d4407d8113260e4c2e2965699c0c6b280d09;hpb=aad526af3708cc6796d906eb877253435aa0c29c

diff --git a/chroot-script b/chroot-script
index 3650c6f..5ca8295 100755
--- a/chroot-script
+++ b/chroot-script
@@ -196,7 +196,8 @@ kernel() {
      if [ "$RELEASE" = 'sarge' ] ; then
         KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL"
      else
-        KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL"
+        # note: install busybox to be able to debug initramfs
+        KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
      fi
       DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
   fi
@@ -221,8 +222,14 @@ passwords()
   echo "Activating shadow passwords."
   shadowconfig on
 
+  CHPASSWD_OPTION=
+  if chpasswd --help 2>&1 | grep -q -- '-m,' ; then
+     CHPASSWD_OPTION='-m'
+  fi
+
+
   if [ -n "$ROOTPASSWORD" ] ; then
-     echo root:"$ROOTPASSWORD" | chpasswd -m
+     echo root:"$ROOTPASSWORD" | chpasswd $CHPASSWD_OPTION
      export ROOTPASSWORD=''
   else
     a='1'
@@ -240,7 +247,7 @@ passwords()
          a='1'
          b='2'
        else
-         echo root:"$a" | chpasswd -m
+         echo root:"$a" | chpasswd $CHPASSWD_OPTION
          unset a
          unset b
        fi
@@ -469,7 +476,7 @@ finalize() {
 
 # execute the functions {{{
  for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \
-     packages extrapackages mkinitrd kernel reconfigure hosts interfaces   \
+     kernel packages extrapackages mkinitrd reconfigure hosts interfaces   \
      timezone fstab hostname initrd grub passwords custom_scripts services ; do
      if stage $i ; then
        $i && stage $i done || exit 1