X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=70bb1257e507e1bc8962c33fab9f6b27bdc8937b;hp=46c5d43aa5efd6fae6fc3ceaea8b58e4447770fe;hb=b9d3a48b1f39e0cded6125c7cb2e1447b683eade;hpb=5afe60315c73b5943152c79c3f4c64dae5699a42

diff --git a/autoconfig.functions b/autoconfig.functions
index 46c5d43..70bb125 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1090,13 +1090,13 @@ if checkbootparam 'ssh' ; then
       echo "root:$SSH_PASSWD" | chpasswd $chpass_options
    fi
 
-   einfo "Starting secure shell server in background for user $localuser"
+   einfo "Starting secure shell server in background for root and user $localuser"
    /etc/init.d/rmnologin start >>$DEBUG 2>>$DEBUG
    /etc/init.d/ssh start >>$DEBUG 2>>$DEBUG &
    eend $?
 
    eindent
-   ewarn "Warning: please change the password for user $localuser as soon as possible!"
+   ewarn "Warning: please change the password for root and user $localuser as soon as possible!"
    eoutdent
 fi
 }
@@ -1476,7 +1476,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
    config_userlocal
  cat>|/etc/init.d/xstartup<<EOF
 #!/bin/sh
-su $localuser -c "/usr/bin/grml-x"
+su $localuser -c "/usr/bin/grml-x ${WINDOWMANAGER}"
 EOF
    chmod 755 /etc/init.d/xstartup