Commit 6a15ae8d authored by Natanael Copa's avatar Natanael Copa
Browse files

init: only install sshd if there are no apkovl

User may have chosen dropbear, in which case we don't want install
openssh.
parent a5f05c98
......@@ -653,6 +653,14 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then
rc_add firstboot default
# add openssh
if [ -n "$KOPT_ssh_key" ]; then
pkgs="$pkgs openssh"
rc_add sshd default
fi
fi
rm -f "$sysroot/etc/.default_boot_services"
fi
......@@ -732,12 +740,6 @@ if [ "$KOPT_chart" = yes ]; then
pkgs="$pkgs acct"
fi
# add openssh
if [ -n "$KOPT_ssh_key" ]; then
pkgs="$pkgs openssh"
rc_add sshd default
fi
# use swclock if no RTC is found
if rtc_exists || [ "$(uname -m)" = "s390x" ]; then
rc_add hwclock boot
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment