diff options
| author | Alistair Delva <adelva@google.com> | 2020-08-20 16:14:23 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-08-20 16:53:18 -0700 |
| commit | d9da10d147d633fdb6ec65e17ff4b8447419d83e (patch) | |
| tree | 8f93e8fdc2907f141e0924910bfec26669819f0b /start-ssh | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f (diff) | |
| parent | ecb2c02d994b3e21994f31a70ff911667c262f1f (diff) | |
Merge upstream-master into master
Commit ecb2c02d994b3e21994f31a70ff911667c262f1f upstream
This nearly (but not quite) corresponds to V_8_3_P1; subsequent
cherry-picks will correct this.
Bug: 162492243
Change-Id: I3c079d86435b7c25aefff4538dc89a3002b1e25b
Diffstat (limited to 'start-ssh')
| -rw-r--r-- | start-ssh | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -9,7 +9,7 @@ DSA_PUB_KEY=/data/ssh/ssh_host_dsa_key.pub RSA_KEY=/data/ssh/ssh_host_rsa_key RSA_PUB_KEY=/data/ssh/ssh_host_rsa_key.pub AUTHORIZED_KEYS=/data/ssh/authorized_keys -DEFAULT_AUTHORIZED_KEYS=/system/etc/security/authorized_keys.default +DEFAULT_AUTHORIZED_KEYS=/vendor/etc/security/authorized_keys.default if [ ! -f $DSA_KEY ]; then /system/bin/ssh-keygen -t dsa -f $DSA_KEY -N "" @@ -30,8 +30,8 @@ fi if [ "1" == "$DEBUG" ] ; then # run sshd in debug mode and capture output to logcat - /system/bin/logwrapper /system/bin/sshd -f /system/etc/ssh/sshd_config -D -d + /system/bin/logwrapper /system/bin/sshd -f /vendor/etc/ssh/sshd_config -D -d else # don't daemonize - otherwise we can't stop the sshd service - /system/bin/sshd -f /system/etc/ssh/sshd_config -D + /system/bin/sshd -f /vendor/etc/ssh/sshd_config -D fi |