Würgaround for changed chpasswd options

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 3650c6f..347bead 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -221,8 +221,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 +246,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 +475,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