Make sure the passwd command succeeds

diff --git a/chroot-script b/chroot-script
index 3cd2196..cea2f7d 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Apr 28 20:19:58 CEST 2007 [mika]
+# Latest change: Son Dez 16 16:30:31 CET 2007 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -258,6 +258,7 @@ passwords() {
      echo "Setting password for user root:"
      set +e # do not exit if passwd returns error due to missmatching passwords
      passwd
+     until passwd; do echo "Please try again to set the password:" ; done
      echo ""
      set -e # restore default behaviour again
   fi

diff --git a/debian/changelog b/debian/changelog
index a2c67c3..5d026c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-debootstrap (0.15) unstable; urgency=low
+
+  * Make sure the passwd command succeeds.
+    Thanks, Wolfgang Karall! [Closes: issue363]
+
+ -- Michael Prokop <mika@grml.org>  Sun, 16 Dec 2007 16:30:37 +0100
+
 grml-debootstrap (0.14) unstable; urgency=low
 
   * Make sure variable ISO is unset variable if not used.