aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-06-12 15:02:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-12 15:02:08 +0000
commitc6d2818c536940c4e3f254009beb6d5426e2519c (patch)
treef2d6d97e3c9b1311c759b17ed9802fe827662798
parent64be7028a529d940f81fda31a8e1dfa2281e4989 (diff)
downloadmkinitfs-c6d2818c536940c4e3f254009beb6d5426e2519c.tar.bz2
mkinitfs-c6d2818c536940c4e3f254009beb6d5426e2519c.tar.xz
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
-rwxr-xr-xinitramfs-init.in5
1 files 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