X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=autoconfig.functions;h=787252a6c6667fa577a7f6422c92e9022773f006;hb=17a8f3d7f320670980c43388a73097922285f6a4;hp=0a0b3955765b98a29372e819c7a29879f33b95de;hpb=e34f777b1698b1f032ff2172bc52f2bd436782b5;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index 0a0b395..787252a 100755
--- 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.'