From: Ulrich Dangel <uli@spamt.net>
Date: Tue, 16 Jun 2009 13:46:54 +0000 (+0200)
Subject: Würgaround for changed chpasswd options
X-Git-Tag: v0.28~2
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=65c58bfa1cc8e90ecfa0d576a64e08a790c57d7e;ds=sidebyside

Würgaround for changed chpasswd options

Signed-off-by: Ulrich Dangel <uli@spamt.net>
---

diff --git a/chroot-script b/chroot-script
index 8f545cf..347bead 100755
--- 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