Drop the second passwd call

diff --git a/chroot-script b/chroot-script
index cea2f7d..b7024aa 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.
 # 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: Son Dez 16 16:30:31 CET 2007 [mika]
+# Latest change: Mit Dez 19 10:10:50 CET 2007 [mika]

 ################################################################################
 
 set -e # exit on any error
 ################################################################################
 
 set -e # exit on any error


@@ -257,9 +257,8 @@ passwords() {
   else
      echo "Setting password for user root:"
      set +e # do not exit if passwd returns error due to missmatching passwords
   else
      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
      until passwd; do echo "Please try again to set the password:" ; done

-     echo ""
+     echo

      set -e # restore default behaviour again
   fi
 }
      set -e # restore default behaviour again
   fi
 }

diff --git a/debian/changelog b/debian/changelog
index 5d026c5..3438269 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-debootstrap (0.16) unstable; urgency=low
+
+  * Drop the second passwd call.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 19 Dec 2007 10:10:54 +0100
+

 grml-debootstrap (0.15) unstable; urgency=low
 
   * Make sure the passwd command succeeds.
 grml-debootstrap (0.15) unstable; urgency=low
 
   * Make sure the passwd command succeeds.