diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 13:27:36 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-01 13:27:36 +0000 |
| commit | 06792ad313385fea82b7fa9a0871e76fdd3c9d07 (patch) | |
| tree | 39add8279f330a50c321d1b445d34915cfb9b1dd /tcwg-base | |
| parent | bd4718155732038844245da6cafd017a2464e580 (diff) | |
tcwg-base: Adjust handling of "--key file" option
... to require "--key .../authorized_keys-USER" filename format,
and deduce user for which key should be installed from that filename.
The "--key file" option is not used anywhere yet, so this is a NOP.
Change-Id: Ia85d4092fbc3cbc4ef16f337caf83ae410595994
Diffstat (limited to 'tcwg-base')
| -rwxr-xr-x | tcwg-base/new-user.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tcwg-base/new-user.sh b/tcwg-base/new-user.sh index 7bb022dc..d3abe709 100755 --- a/tcwg-base/new-user.sh +++ b/tcwg-base/new-user.sh @@ -65,11 +65,12 @@ if [ x"$user" != x"" ]; then sudoers_file=/etc/sudoers.d/$(echo $user | tr "." "-") echo "$user ALL = NOPASSWD: ALL" > $sudoers_file chmod 0440 $sudoers_file +fi - if [ x"$key" != x"" ] ; then - sudo -i -u $user mkdir -p /home/$user/.ssh - sudo -i -u $user chmod 0700 /home/$user/.ssh - cat "$key" | sudo -i -u $user tee /home/$user/.ssh/authorized_keys > /dev/null - sudo -i -u $user chmod 0600 /home/$user/.ssh/authorized_keys - fi +if [ x"$key" != x"" ]; then + key_user=$(echo "$key" | sed -e "s/.*authorized_keys-//") + sudo -i -u $key_user mkdir -p /home/$key_user/.ssh + sudo -i -u $key_user chmod 0700 /home/$key_user/.ssh + cat "$key" | sudo -i -u $key_user tee /home/$key_user/.ssh/authorized_keys > /dev/null + sudo -i -u $key_user chmod 0600 /home/$key_user/.ssh/authorized_keys fi |