From 17a8f3d7f320670980c43388a73097922285f6a4 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 20 May 2009 18:04:10 +0200 Subject: [PATCH] Fix bootoption ssh --- autoconfig.functions | 7 ++++++- debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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 Wed, 20 May 2009 18:02:23 +0200 + grml-autoconfig (0.8.21) unstable; urgency=low * Install haltlocal initscript in postinst script. -- 2.1.4