Fix bootoption ssh

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index 0a0b395..787252a 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -891,7 +891,7 @@ config_hwspeak(){
          flitewrapper "Sorry, no speakup module specified for bootoption speakup.synth."
       else
          einfo "Trying to load $module"
-         modprobe $module
+         modprobe "speakup_${module}"
          eend $?
       fi
 
@@ -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.'