How can openssh.postinst be disabled from within the rule files?
---
rules/openssh.in | 14 ++++++++++----
rules/openssh.make | 2 ++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/rules/openssh.in b/rules/openssh.in
index 09f5c5555..f9d1affbd 100644
--- a/rules/openssh.in
+++ b/rules/openssh.in
@@ -6,10 +6,10 @@ menuconfig OPENSSH
select OPENSSL
select LIBC_CRYPT
select LIBC_UTIL
- select RC_ONCE if OPENSSH_SSHD && RUNTIME
+ select RC_ONCE if OPENSSH_SSHD_GENKEYS && RUNTIME
select BUSYBOX_START_STOP_DAEMON if OPENSSH_SSHD_STARTSCRIPT
select LIBSELINUX if GLOBAL_SELINUX
- select OPENSSH_KEYGEN if OPENSSH_SSHD
+ select OPENSSH_KEYGEN if OPENSSH_SSHD_GENKEYS
prompt "openssh "
help
secure shell client/server, an rlogin/rsh/rcp replacement
@@ -40,15 +40,21 @@ config OPENSSH_SSHD
config OPENSSH_SSHD_STARTSCRIPT
bool
default y
- depends on OPENSSH_SSHD
+ depends on OPENSSH_SSHD && INITMETHOD_BBINIT
prompt "install /etc/init.d/openssh"
config OPENSSH_SSHD_SYSTEMD_UNIT
bool
default y
- depends on OPENSSH_SSHD && SYSTEMD
+ depends on OPENSSH_SSHD && INITMETHOD_SYSTEMD
prompt "install systemd unit files for sshd"
+config OPENSSH_SSHD_GENKEYS
+ bool
+ default y
+ depends on OPENSSH_SSHD
+ prompt "generate sshd host keys at first boot"
+
config OPENSSH_SCP
bool "scp"
help
diff --git a/rules/openssh.make b/rules/openssh.make
index cae04487f..0da2f23cd 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -105,8 +105,10 @@ ifdef PTXCONF_OPENSSH_SSHD
/etc/ssh/moduli)
@$(call install_copy, openssh, 0, 0, 0755, -, \
/usr/sbin/sshd)
+ifdef OPENSSH_SSHD_GENKEYS
@$(call install_alternative, openssh, 0, 0, 0755,
/etc/rc.once.d/openssh)
endif
+endif
ifdef PTXCONF_INITMETHOD_BBINIT
ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT
--
2.29.2
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
