From: Michael Prokop <mika@grml.org>
Date: Wed, 20 May 2009 16:04:10 +0000 (+0200)
Subject: Fix bootoption ssh
X-Git-Tag: v0.8.22~1
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=17a8f3d7f320670980c43388a73097922285f6a4

Fix bootoption ssh
---

diff --git a/autoconfig.functions b/autoconfig.functions
index af4ce8a..787252a 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1464,7 +1464,12 @@ if checkbootparam ssh ; then
 
    # finally check if we have a password we can use:
    if [ -n "$SSH_PASSWD" ] ; then
-      echo "grml:$SSH_PASSWD" | chpasswd -m
+      # chpasswd sucks, seriously.
+      if chpasswd --help 2>&1 | grep -q -- '-m,' ; then
+        echo "grml:$SSH_PASSWD" | chpasswd -m
+      else
+        echo "grml:$SSH_PASSWD" | chpasswd
+      fi
    fi
 
    einfo 'Starting secure shell server in background.'
diff --git a/debian/changelog b/debian/changelog
index 70ad9db..a24de2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.8.22) unstable; urgency=low
+
+  * Fix bootoption "ssh": current versions of chpasswd don't support
+    option '-m' anymore (foo, this sucks!). [Testing: issue671]
+
+ -- Michael Prokop <mika@grml.org>  Wed, 20 May 2009 18:02:23 +0200
+
 grml-autoconfig (0.8.21) unstable; urgency=low
 
   * Install haltlocal initscript in postinst script.