From c6d2818c536940c4e3f254009beb6d5426e2519c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 12 Jun 2018 15:02:08 +0000 Subject: init: remove ssh_pass and make sure to start sshd ssh_pass is not recommended and causes some issues in firstboot. We remove support for it to keep things simple. also make sure that sshd is started if ssh_key is set --- initramfs-init.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/initramfs-init.in b/initramfs-init.in index f33f010..9816ab7 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -286,7 +286,7 @@ set -- $(cat /proc/cmdline) myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm cryptheader cryptoffset cryptdiscards debug_init dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root usbdelay ip alpine_repo apkovl alpine_start splash blacklist - overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd ssh_key ssh_pass" + overlaytmpfs rootfstype rootflags nbd resume s390x_net dasd ssh_key" for opt; do case "$opt" in @@ -642,8 +642,9 @@ if [ "$KOPT_chart" = yes ]; then fi # add openssh -if [ -n "$KOPT_ssh_key" ] || [ -n "$KOPT_ssh_pass" ]; then +if [ -n "$KOPT_ssh_key" ]; then pkgs="$pkgs openssh" + rc_add sshd default fi # add wget if using secure urls in cmdline -- cgit v1.2.3