projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set root password to specified/generated ssh password.
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
b890f4c
..
46c5d43
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-1053,7
+1053,7
@@
if checkbootparam 'ssh' ; then
SSH_PASSWD=''
SSH_PASSWD="$(getbootparam 'ssh' 2>>$DEBUG)"
config_userlocal
SSH_PASSWD=''
SSH_PASSWD="$(getbootparam 'ssh' 2>>$DEBUG)"
config_userlocal
- einfo "Bootoption ssh found, trying to set password for user $localuser"
+ einfo "Bootoption ssh found, trying to set password for
root and
user $localuser"
[ -z "$localuser" ] && eend 1
eindent
if [ -z "$SSH_PASSWD" ] ; then
[ -z "$localuser" ] && eend 1
eindent
if [ -z "$SSH_PASSWD" ] ; then
@@
-1082,11
+1082,12
@@
if checkbootparam 'ssh' ; then
# finally check if we have a password we can use:
if [ -n "$SSH_PASSWD" ] ; then
# chpasswd sucks, seriously.
# finally check if we have a password we can use:
if [ -n "$SSH_PASSWD" ] ; then
# chpasswd sucks, seriously.
+ chpass_options=""
if chpasswd --help 2>&1 | grep -q -- '-m,' ; then
if chpasswd --help 2>&1 | grep -q -- '-m,' ; then
- echo "$localuser:$SSH_PASSWD" | chpasswd -m
- else
- echo "$localuser:$SSH_PASSWD" | chpasswd
+ chpass_options="-m"
fi
fi
+ echo "$localuser:$SSH_PASSWD" | chpasswd $chpass_options
+ echo "root:$SSH_PASSWD" | chpasswd $chpass_options
fi
einfo "Starting secure shell server in background for user $localuser"
fi
einfo "Starting secure shell server in background for user $localuser"