From 24cf43b69a8a057785facc2c05ea790298e7f149 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Fri, 20 Nov 2020 09:27:18 +0100
Subject: rules: cleanup busybox init start script handling

Make the options only visible if INITMETHOD_BBINIT is enabled.  This makes
the menu cleaner and the extra 'ifdef PTXCONF_INITMETHOD_BBINIT' can be
dropped.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 rules/alsa-utils.in       | 1 +
 rules/alsa-utils.make     | 2 --
 rules/at.in               | 2 +-
 rules/at.make             | 2 --
 rules/busybox.in          | 8 ++++++--
 rules/busybox.make        | 3 ---
 rules/chrony.make         | 2 --
 rules/connman.in          | 1 +
 rules/connman.make        | 2 --
 rules/dbus.in             | 1 +
 rules/dbus.make           | 2 --
 rules/dnsmasq.in          | 1 +
 rules/dnsmasq.make        | 2 --
 rules/dropbear.in         | 1 +
 rules/dropbear.make       | 2 --
 rules/haveged.in          | 1 +
 rules/haveged.make        | 2 --
 rules/inetutils.in        | 2 ++
 rules/inetutils.make      | 2 --
 rules/lighttpd.in         | 1 +
 rules/lighttpd.make       | 2 --
 rules/lldpd.in            | 1 +
 rules/lldpd.make          | 2 --
 rules/lvm2.in             | 1 +
 rules/monit.in            | 1 +
 rules/monit.make          | 2 --
 rules/networkmanager.in   | 2 +-
 rules/networkmanager.make | 2 --
 rules/nfsutils.in         | 2 +-
 rules/nfsutils.make       | 2 --
 rules/nftables.in         | 1 +
 rules/nftables.make       | 2 --
 rules/ntp.in              | 4 ++--
 rules/ntp.make            | 4 ----
 rules/ntpclient.in        | 1 +
 rules/ntpclient.make      | 2 --
 rules/openntpd.in         | 1 +
 rules/openntpd.make       | 2 --
 rules/openssh.make        | 2 --
 rules/portmap.in          | 1 +
 rules/portmap.make        | 2 --
 rules/ppp.in              | 1 +
 rules/ppp.make            | 2 --
 rules/proftpd.in          | 1 +
 rules/proftpd.make        | 2 --
 rules/pureftpd.in         | 1 +
 rules/pureftpd.make       | 2 --
 rules/rng-tools.in        | 2 +-
 rules/rng-tools.make      | 2 --
 rules/rsync.in            | 1 +
 rules/rsync.make          | 4 ----
 rules/rsync3.in           | 1 +
 rules/rsync3.make         | 2 --
 rules/samba.make          | 2 --
 rules/syslogng.in         | 1 +
 rules/syslogng.make       | 2 --
 rules/thttpd.make         | 2 --
 rules/udev.make           | 2 --
 rules/urshd.in            | 1 +
 rules/urshd.make          | 2 --
 rules/utelnetd.in         | 1 +
 rules/utelnetd.make       | 2 --
 rules/weston.in           | 3 ++-
 rules/weston.make         | 2 --
 64 files changed, 38 insertions(+), 82 deletions(-)

diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
index 0615e73f6..6143e1281 100644
--- a/rules/alsa-utils.in
+++ b/rules/alsa-utils.in
@@ -25,6 +25,7 @@ if ALSA_UTILS
 config ALSA_UTILS_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/alsa-utils"
 
 config ALSA_UTILS_SYSTEMD_UNIT
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 9652f24ba..c7ff80984 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -98,7 +98,6 @@ ifdef PTXCONF_ALSA_UTILS_ALSALOOP
 	@$(call install_copy, alsa-utils, 0, 0, 0755, -, /usr/bin/alsaloop)
 endif
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_ALSA_UTILS_STARTSCRIPT
 	@$(call install_alternative, alsa-utils, 0, 0, 0755, /etc/init.d/alsa-utils, n)
 ifneq ($(call remove_quotes,$(PTXCONF_ALSA_UTILS_BBINIT_LINK)),)
@@ -107,7 +106,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_ALSA_UTILS_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_ALSA_UTILS_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_ALSA_UTILS_SYSTEMD_UNIT
 	@$(call install_alternative, alsa-utils, 0, 0, 0644, \
 		/usr/lib/systemd/system/alsa-restore.service)
diff --git a/rules/at.in b/rules/at.in
index 0c08ac062..ef3bda324 100644
--- a/rules/at.in
+++ b/rules/at.in
@@ -44,7 +44,7 @@ config AT_ATD
 config AT_STARTSCRIPT
 	bool "install /etc/init.d/atd"
 	default y
-	depends on AT_ATD
+	depends on AT_ATD && INITMETHOD_BBINIT
 
 config AT_AT
 	bool "install at"
diff --git a/rules/at.make b/rules/at.make
index ebb2464cd..5a105e271 100644
--- a/rules/at.make
+++ b/rules/at.make
@@ -75,7 +75,6 @@ $(STATEDIR)/at.targetinstall:
 	@$(call install_copy, at, 0, 0, 1770, /var/spool/cron/atspool)
 	@$(call install_copy, at, 0, 0, 0600, -, /var/spool/cron/atjobs/.SEQ)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_AT_STARTSCRIPT
 	@$(call install_alternative, at, 0, 0, 0755, /etc/init.d/atd)
 
@@ -85,7 +84,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_AT_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_AT_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_AT_ATD
 	@$(call install_copy, at, 0, 0, 0755, -, /usr/sbin/atd)
diff --git a/rules/busybox.in b/rules/busybox.in
index b7bf0ace7..380063406 100644
--- a/rules/busybox.in
+++ b/rules/busybox.in
@@ -24,7 +24,7 @@ if BUSYBOX
 
 config BUSYBOX_INETD_STARTSCRIPT
 	bool
-	depends on BUSYBOX_INETD
+	depends on BUSYBOX_INETD && INITMETHOD_BBINIT
 	default y
 	prompt "install /etc/init.d/inetd"
 
@@ -42,7 +42,7 @@ choice
 	config BUSYBOX_TELNETD_STARTSCRIPT
 		bool
 		prompt "startscript (standalone)"
-		depends on BUSYBOX_FEATURE_TELNETD_STANDALONE
+		depends on BUSYBOX_FEATURE_TELNETD_STANDALONE && INITMETHOD_BBINIT
 		help
 		  start busybox telnetd server in standalone mode.
 		  I.e. without inetd.
@@ -54,6 +54,8 @@ choice
 		  start busybox telnetd server from inetd
 endchoice
 
+if INITMETHOD_BBINIT
+
 config BUSYBOX_UDHCPD_STARTSCRIPT
 	bool
 	depends on BUSYBOX_UDHCPD
@@ -84,6 +86,8 @@ config BUSYBOX_BB_SYSCTL_STARTSCRIPT
 	default y
 	prompt "Install /etc/init.d/sysctl"
 
+endif
+
 comment "---"
 
 config BUSYBOX_TELNETD_SYSTEMD_UNIT
diff --git a/rules/busybox.make b/rules/busybox.make
index d5d6aa6c2..647308411 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -150,7 +150,6 @@ endif
 #	# bb init: start scripts
 #	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_BUSYBOX_INETD_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/inetd)
 
@@ -221,8 +220,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_BUSYBOX_BB_SYSCTL_BBINIT_LINK)),)
 endif
 endif
 
-endif # PTXCONF_INITMETHOD_BBINIT
-
 ifdef PTXCONF_BUSYBOX_TELNETD_SYSTEMD_UNIT
 	@$(call install_alternative, busybox, 0, 0, 0644, \
 		/usr/lib/systemd/system/telnetd.socket)
diff --git a/rules/chrony.make b/rules/chrony.make
index f5e40dfb8..7cf59f305 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -114,7 +114,6 @@ endif
 #	#
 #	# busybox init: startscripts
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_CHRONY_STARTSCRIPT
 	@$(call install_alternative, chrony, 0, 0, 0755, /etc/init.d/chrony)
 
@@ -124,7 +123,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_CHRONY_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_CHRONY_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_CHRONY_SYSTEMD_UNIT
 	@$(call install_alternative, chrony, 0, 0, 0644, /usr/lib/systemd/system/chronyd.service)
diff --git a/rules/connman.in b/rules/connman.in
index 3c2eb11a0..a50dc11e5 100644
--- a/rules/connman.in
+++ b/rules/connman.in
@@ -71,6 +71,7 @@ config CONNMAN_TESTS
 config CONNMAN_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/connman"
 
 config CONNMAN_SYSTEMD_UNIT
diff --git a/rules/connman.make b/rules/connman.make
index 9f5d21b01..d6eed8aa8 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -136,7 +136,6 @@ $(STATEDIR)/connman.targetinstall:
 #	# binary
 	@$(call install_copy, connman, 0, 0, 0755, -, /usr/sbin/connmand)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_CONNMAN_STARTSCRIPT
 	@$(call install_alternative, connman, 0, 0, 0755, /etc/init.d/connman, n)
 
@@ -146,7 +145,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_CONNMAN_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_CONNMAN_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_CONNMAN_SYSTEMD_UNIT
 	@$(call install_alternative, connman, 0, 0, 0644, \
 		/usr/lib/systemd/system/connman.service)
diff --git a/rules/dbus.in b/rules/dbus.in
index 1f992c211..3af3e5ca1 100644
--- a/rules/dbus.in
+++ b/rules/dbus.in
@@ -44,6 +44,7 @@ config DBUS_X
 config DBUS_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/dbus"
 
 config DBUS_SYSTEMD_UNIT
diff --git a/rules/dbus.make b/rules/dbus.make
index 53d19f6bf..168c58956 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -122,7 +122,6 @@ $(STATEDIR)/dbus.targetinstall:
 #	# busybox init: start script
 #	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_DBUS_STARTSCRIPT
 	@$(call install_alternative, dbus, 0, 0, 0755, /etc/init.d/dbus)
 
@@ -132,7 +131,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_DBUS_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_DBUS_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_DBUS_SYSTEMD_UNIT
 	@$(call install_copy, dbus, 0, 0, 0644, -, \
 		/usr/lib/systemd/system/dbus.socket)
diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index 12de6e27f..6d2d98999 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -99,6 +99,7 @@ choice
 
 	config DNSMASQ_STARTSCRIPT
 		bool
+		depends on INITMETHOD_BBINIT
 		prompt "standalone"
 		help
 		  This installs dnsmasq startup script /etc/init.d/dnsmasq.
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 86488e1e7..4f3e29be3 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -85,7 +85,6 @@ ifdef PTXCONF_DNSMASQ_INETD
 	@$(call install_alternative, dnsmasq, 0, 0, 0644, /etc/inetd.conf.d/dnsmasq)
 endif
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_DNSMASQ_STARTSCRIPT
 	@$(call install_alternative, dnsmasq, 0, 0, 0755, /etc/init.d/dnsmasq)
 
@@ -95,7 +94,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_DNSMASQ_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_DNSMASQ_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_DNSMASQ_SYSTEMD_UNIT
 	@$(call install_alternative, dnsmasq, 0, 0, 0644, \
 		/usr/lib/systemd/system/dnsmasq.service)
diff --git a/rules/dropbear.in b/rules/dropbear.in
index c0da7e222..5f619145b 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -355,6 +355,7 @@ comment "runtime options        ---"
 config DROPBEAR_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/dropbear"
 
 endif
diff --git a/rules/dropbear.make b/rules/dropbear.make
index 6d6e248a2..536c9176a 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -296,7 +296,6 @@ endif
 #	# busybox init: start script
 #	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_DROPBEAR_STARTSCRIPT
 	@$(call install_alternative, dropbear, 0, 0, 0755, /etc/init.d/dropbear, n)
 	@$(call install_replace, dropbear, /etc/init.d/dropbear, \
@@ -310,7 +309,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_DROPBEAR_BBINIT_LINK)),)
 		../init.d/dropbear, \
 		/etc/rc.d/$(PTXCONF_DROPBEAR_BBINIT_LINK))
 endif
-endif
 endif
 
 	@$(call install_copy, dropbear, 0, 0, 0755, $(PTXCONF_DROPBEAR_KEY_DIR))
diff --git a/rules/haveged.in b/rules/haveged.in
index f0b4bb1e3..a4a3a2218 100644
--- a/rules/haveged.in
+++ b/rules/haveged.in
@@ -12,6 +12,7 @@ if HAVEGED
 
 config HAVEGED_STARTSCRIPT
 	bool
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/haveged"
 
 config HAVEGED_SYSTEMD_UNIT
diff --git a/rules/haveged.make b/rules/haveged.make
index 7c015c714..cce41a248 100644
--- a/rules/haveged.make
+++ b/rules/haveged.make
@@ -63,7 +63,6 @@ $(STATEDIR)/haveged.targetinstall:
 	@$(call install_lib, haveged, 0, 0, 0644, libhavege)
 	@$(call install_copy, haveged, 0, 0, 0755, -, /usr/sbin/haveged)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_HAVEGED_STARTSCRIPT
 	@$(call install_alternative, haveged, 0, 0, 0755, /etc/init.d/haveged)
 
@@ -72,7 +71,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_HAVEGED_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_HAVEGED_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_HAVEGED_SYSTEMD_UNIT
 	@$(call install_alternative, haveged, 0, 0, 0644, \
diff --git a/rules/inetutils.in b/rules/inetutils.in
index 4a8eee957..43ed3443a 100644
--- a/rules/inetutils.in
+++ b/rules/inetutils.in
@@ -30,6 +30,7 @@ if INETUTILS_INETD
 config INETUTILS_INETD_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/inetd"
 	help
 	  Install an init script for the network super daemon inetd
@@ -113,6 +114,7 @@ config INETUTILS_SYSLOGD_STARTSCRIPT
 	bool
 	prompt "install /etc/init.d/syslogd"
 	default y
+	depends on INITMETHOD_BBINIT
 	help
 	  Install this script to be able to run this service at system startup
 
diff --git a/rules/inetutils.make b/rules/inetutils.make
index 19f59dd5d..21ead2a1c 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -155,7 +155,6 @@ endif
 #	# busybox init: start script
 #	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_INETUTILS_INETD_STARTSCRIPT
 	@$(call install_alternative, inetutils, 0, 0, 0755, /etc/init.d/inetd, n)
 
@@ -164,7 +163,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_INETUTILS_INETD_BBINIT_LINK)),)
 		../init.d/inetd, \
 		/etc/rc.d/$(PTXCONF_INETUTILS_INETD_BBINIT_LINK))
 endif
-endif
 endif
 
 	@$(call install_finish, inetutils)
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 0e1dde14d..05dd5fae3 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -217,6 +217,7 @@ menu "startup                     "
 config LIGHTTPD_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/lighttpd"
 
 config LIGHTTPD_SYSTEMD_UNIT
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 7161c49b7..6bb442d0b 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -149,7 +149,6 @@ endif
 #	# busybox init: start script
 #	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_LIGHTTPD_STARTSCRIPT
 	@$(call install_alternative, lighttpd, 0, 0, 0755, /etc/init.d/lighttpd)
 
@@ -159,7 +158,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_LIGHTTPD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_LIGHTTPD_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_LIGHTTPD_SYSTEMD_UNIT
 	@$(call install_alternative, lighttpd, 0, 0, 0644, \
diff --git a/rules/lldpd.in b/rules/lldpd.in
index 4d72c0352..8b253ba83 100644
--- a/rules/lldpd.in
+++ b/rules/lldpd.in
@@ -94,6 +94,7 @@ config LLDPD_XML
 
 config LLDPD_STARTSCRIPT
 	bool
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/lldpd"
 	default y
 
diff --git a/rules/lldpd.make b/rules/lldpd.make
index ec1c7c571..7dbda5ffa 100644
--- a/rules/lldpd.make
+++ b/rules/lldpd.make
@@ -77,7 +77,6 @@ $(STATEDIR)/lldpd.targetinstall:
 
 	@$(call install_lib, lldpd, 0, 0, 0644, liblldpctl)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_LLDPD_STARTSCRIPT
 	@$(call install_alternative, lldpd, 0, 0, 0755, /etc/init.d/lldpd)
 	@$(call install_replace, lldpd, /etc/init.d/lldpd, \
@@ -90,7 +89,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_LLDPD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_LLDPD_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_LLDPD_SYSTEMD_UNIT
 	@$(call install_alternative, lldpd, 0, 0, 0644, /usr/lib/systemd/system/lldpd.service)
diff --git a/rules/lvm2.in b/rules/lvm2.in
index fc9414bb7..2f44e5df2 100644
--- a/rules/lvm2.in
+++ b/rules/lvm2.in
@@ -27,6 +27,7 @@ if LVM2_LVM_TOOLS
 config LVM2_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
         prompt "install /etc/init.d/lvm2"
 
 endif
diff --git a/rules/monit.in b/rules/monit.in
index 31b00ee0c..383433e78 100644
--- a/rules/monit.in
+++ b/rules/monit.in
@@ -23,6 +23,7 @@ config MONIT_ZLIB
 
 config MONIT_STARTSCRIPT
 	bool
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/monit"
 	default y
 
diff --git a/rules/monit.make b/rules/monit.make
index 51ca33f9d..13882770d 100644
--- a/rules/monit.make
+++ b/rules/monit.make
@@ -64,14 +64,12 @@ $(STATEDIR)/monit.targetinstall:
 	@$(call install_copy, monit, 0, 0, 0755, /var/lib/monit/events)
 	@$(call install_alternative, monit, 0, 0, 0600, /etc/monitrc)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_MONIT_STARTSCRIPT
 	@$(call install_alternative, monit, 0, 0, 0755, /etc/init.d/monit)
 ifneq ($(call remove_quotes,$(PTXCONF_MONIT_BBINIT_LINK)),)
 	@$(call install_link, monit, ../init.d/monit, \
 		/etc/rc.d/$(PTXCONF_MONIT_BBINIT_LINK))
 endif
-endif
 endif
 
 	@$(call install_finish, monit)
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 22c311f04..f86a68dd6 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -44,7 +44,7 @@ menuconfig NETWORKMANAGER
 if NETWORKMANAGER
 
 config NETWORKMANAGER_STARTSCRIPT
-	depends on !INITMETHOD_SYSTEMD
+	depends on INITMETHOD_BBINIT
 	bool
 	default y
 	prompt "install /etc/init.d/NetworkManager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 8e89a11e7..ea7a4b28d 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -146,7 +146,6 @@ $(STATEDIR)/networkmanager.targetinstall:
 
 	@$(call install_copy, networkmanager, 0, 0, 0755, /var/lib/NetworkManager)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_NETWORKMANAGER_STARTSCRIPT
 	@$(call install_alternative, networkmanager, 0, 0, 0755, /etc/init.d/NetworkManager)
 
@@ -156,7 +155,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_NETWORKMANAGER_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_NETWORKMANAGER_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT
 	@$(call install_alternative, networkmanager, 0, 0, 0644, \
 		/usr/lib/systemd/system/NetworkManager.service)
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index c086f5a7f..057641754 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -43,7 +43,7 @@ config NFSUTILS_PYTHON
 
 config NFSUTILS_NFSD_STARTSCRIPT
 	bool
-	depends on NFSUTILS_SERVER
+	depends on NFSUTILS_SERVER && INITMETHOD_BBINIT
 	default y
 	prompt "install /etc/init.d/nfsd"
 
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index 46cafe45c..213fe97f2 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -127,7 +127,6 @@ endif
 #	#
 #	# busybox init: start scripts
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_NFSUTILS_NFSD_STARTSCRIPT
 	@$(call install_alternative, nfsutils, 0, 0, 0755, /etc/init.d/nfsd)
 
@@ -137,7 +136,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_NFSUTILS_NFSD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_NFSUTILS_NFSD_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_NFSUTILS_SYSTEMD_UNIT
 	@$(call install_alternative, nfsutils, 0, 0, 0644, \
diff --git a/rules/nftables.in b/rules/nftables.in
index 089f68d2e..9a0846dcc 100644
--- a/rules/nftables.in
+++ b/rules/nftables.in
@@ -34,6 +34,7 @@ config NFTABLES_MGMP
 
 config NFTABLES_STARTSCRIPT
 	bool
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/nftables"
 
 config NFTABLES_SYSTEMD_UNIT
diff --git a/rules/nftables.make b/rules/nftables.make
index ab84ff8e3..542071d2c 100644
--- a/rules/nftables.make
+++ b/rules/nftables.make
@@ -57,7 +57,6 @@ $(STATEDIR)/nftables.targetinstall:
 	@$(call install_copy, nftables, 0, 0, 0755, -, /usr/sbin/nft)
 	@$(call install_alternative, nftables, 0, 0, 0755, /etc/nftables.conf)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_NFTABLES_STARTSCRIPT
 	@$(call install_alternative, nftables, 0, 0, 0755, /etc/init.d/nftables)
 
@@ -66,7 +65,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_NFTABLES_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_NFTABLES_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_NFTABLES_SYSTEMD_UNIT
 	@$(call install_alternative, nftables, 0, 0, 0644, /usr/lib/systemd/system/nftables.service)
diff --git a/rules/ntp.in b/rules/ntp.in
index 55bf38b94..2d85c8fac 100644
--- a/rules/ntp.in
+++ b/rules/ntp.in
@@ -136,7 +136,7 @@ comment "BusyBox' ntpd is selected"
 config NTP_NTPD_STARTSCRIPT
 	bool
 	default y
-	depends on NTP_NTPD
+	depends on NTP_NTPD && INITMETHOD_BBINIT
 	prompt "install /etc/init.d/ntp-server"
 
 config NTP_NTPD_SYSTEMD_UNIT
@@ -155,7 +155,7 @@ config NTP_NTPDC
 config NTP_NTPC_STARTSCRIPT
 	bool
 	default y
-	depends on NTP_NTPDC
+	depends on NTP_NTPDC && INITMETHOD_BBINIT
 	prompt "install /etc/init.d/ntp-client"
 
 config NTP_NTPQ
diff --git a/rules/ntp.make b/rules/ntp.make
index 8eac37249..3236eb189 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -177,7 +177,6 @@ ifdef PTXCONF_NTP_NTPD
 	@$(call install_alternative, ntp, 0, 0, 0644, /etc/ntp-server.conf)
 endif
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_NTP_NTPD_STARTSCRIPT
 	@$(call install_alternative, ntp, 0, 0, 0755, /etc/init.d/ntp-server)
 
@@ -187,7 +186,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_NTP_NTPD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_NTP_NTPD_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_NTP_NTPD_SYSTEMD_UNIT
 	@$(call install_alternative, ntp, 0, 0, 0644, \
 		/usr/lib/systemd/system/ntpd.service)
@@ -204,7 +202,6 @@ ifdef PTXCONF_NTP_NTPDC
 	@$(call install_alternative, ntp, 0, 0, 0644, /etc/ntp-client.conf)
 endif
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_NTP_NTPC_STARTSCRIPT
 	@$(call install_alternative, ntp, 0, 0, 0755, /etc/init.d/ntp-client)
 
@@ -214,7 +211,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_NTP_NTPC_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_NTP_NTPC_BBINIT_LINK))
 endif
 endif
-endif
 
 #	#
 #	# ntpq
diff --git a/rules/ntpclient.in b/rules/ntpclient.in
index 0e3b33fc2..9698f33f0 100644
--- a/rules/ntpclient.in
+++ b/rules/ntpclient.in
@@ -61,6 +61,7 @@ comment "runtime options   ---"
 config NTPCLIENT_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/ntpclient"
 
 config NTPCLIENT_NTPSERVER_NAME
diff --git a/rules/ntpclient.make b/rules/ntpclient.make
index df382ff4c..944968711 100644
--- a/rules/ntpclient.make
+++ b/rules/ntpclient.make
@@ -81,7 +81,6 @@ endif
 # busybox init: start script
 #
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_NTPCLIENT_STARTSCRIPT
 	@$(call install_alternative, ntpclient, 0, 0, 0755, /etc/init.d/ntpclient)
 ifneq ($(PTXCONF_NTPCLIENT_NTPSERVER_NAME),"")
@@ -96,7 +95,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_NTPCLIENT_BBINIT_LINK)),)
 		../init.d/ntpclient, \
 		/etc/rc.d/$(PTXCONF_NTPCLIENT_BBINIT_LINK))
 endif
-endif
 endif
 
 	@$(call install_finish, ntpclient)
diff --git a/rules/openntpd.in b/rules/openntpd.in
index 237346f4b..aa4deaa7d 100644
--- a/rules/openntpd.in
+++ b/rules/openntpd.in
@@ -29,6 +29,7 @@ config  OPENNTPD_ARC4RANDOM
 config OPENNTPD_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/openntpd"
 
 endif
diff --git a/rules/openntpd.make b/rules/openntpd.make
index 52acb60e5..05584bf83 100644
--- a/rules/openntpd.make
+++ b/rules/openntpd.make
@@ -61,10 +61,8 @@ $(STATEDIR)/openntpd.targetinstall:
 	# busybox init
 	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_OPENNTPD_STARTSCRIPT
 	@$(call install_alternative, openntpd, 0, 0, 0644, /etc/init.d/ntp-server, n)
-endif
 endif
 
 	@$(call install_finish, openntpd)
diff --git a/rules/openssh.make b/rules/openssh.make
index 99fca3f46..2c86a97a1 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -110,7 +110,6 @@ ifdef PTXCONF_OPENSSH_SSHD_GENKEYS
 endif
 endif
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT
 	@$(call install_alternative, openssh, 0, 0, 0755, /etc/init.d/openssh)
 
@@ -120,7 +119,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_OPENSSH_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_OPENSSH_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_INITMETHOD_SYSTEMD
 ifdef PTXCONF_OPENSSH_SSHD_SYSTEMD_UNIT
 	@$(call install_alternative, openssh, 0, 0, 0644, \
diff --git a/rules/portmap.in b/rules/portmap.in
index e4a366df8..c2f53bd99 100644
--- a/rules/portmap.in
+++ b/rules/portmap.in
@@ -14,6 +14,7 @@ if PORTMAP
 config PORTMAP_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/portmap"
 
 endif
diff --git a/rules/portmap.make b/rules/portmap.make
index c09854a3b..18a7790c7 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -56,7 +56,6 @@ $(STATEDIR)/portmap.targetinstall:
 	#
 	# busybox init
 	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_PORTMAP_STARTSCRIPT
 	@$(call install_alternative, portmap, 0, 0, 0755, /etc/init.d/portmapd, n)
 
@@ -65,7 +64,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_PORTMAP_BBINIT_LINK)),)
 		../init.d/portmapd, \
 		/etc/rc.d/$(PTXCONF_PORTMAP_BBINIT_LINK))
 endif
-endif
 endif
 	@$(call install_finish, portmap)
 	@$(call touch)
diff --git a/rules/ppp.in b/rules/ppp.in
index dcff8a1e9..02f932341 100644
--- a/rules/ppp.in
+++ b/rules/ppp.in
@@ -208,6 +208,7 @@ config PPP_INST_PONOFF
 
 config PPP_STARTSCRIPT
 	bool
+	depends on INITMETHOD_BBINIT
 	select BUSYBOX_KILL if BUSYBOX
 	select BUSYBOX_TEST if BUSYBOX
 	select BUSYBOX_SLEEP if BUSYBOX
diff --git a/rules/ppp.make b/rules/ppp.make
index 8c09cdaf1..fc5f821a5 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -175,7 +175,6 @@ endif
 #	#
 #	# busybox init
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_PPP_STARTSCRIPT
 	@$(call install_alternative, ppp, 0, 0, 0755, /etc/init.d/pppd)
 	@$(call install_replace, ppp, /etc/init.d/pppd, \
@@ -187,7 +186,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_PPPD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_PPPD_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_PPP_INST_PPPDUMP
 	@$(call install_copy, ppp, 0, 0, 0755, -, /usr/sbin/pppdump)
diff --git a/rules/proftpd.in b/rules/proftpd.in
index 7d672f674..9740ab655 100644
--- a/rules/proftpd.in
+++ b/rules/proftpd.in
@@ -85,6 +85,7 @@ config PROFTPD_AUTOSHADOW
 config PROFTPD_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/proftpd"
 
 endif
diff --git a/rules/proftpd.make b/rules/proftpd.make
index 538acb0ad..8cc9893d1 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -87,7 +87,6 @@ $(STATEDIR)/proftpd.targetinstall:
 #	#
 #	# busybox init
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_PROFTPD_STARTSCRIPT
 	@$(call install_alternative, proftpd, 0, 0, 0755, /etc/init.d/proftpd)
 
@@ -96,7 +95,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_PROFTPD_BBINIT_LINK)),)
 		../init.d/proftpd, \
 		/etc/rc.d/$(PTXCONF_PROFTPD_BBINIT_LINK))
 endif
-endif
 endif
 
 	@$(call install_finish, proftpd)
diff --git a/rules/pureftpd.in b/rules/pureftpd.in
index 63b15263a..c9a8a8060 100644
--- a/rules/pureftpd.in
+++ b/rules/pureftpd.in
@@ -93,6 +93,7 @@ config PUREFTPD_SHRINK_MORE
 config PUREFTPD_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/pureftpd"
 
 config PUREFTPD_SYSTEMD_UNIT
diff --git a/rules/pureftpd.make b/rules/pureftpd.make
index 1a0ab2591..229ceeb0b 100644
--- a/rules/pureftpd.make
+++ b/rules/pureftpd.make
@@ -113,7 +113,6 @@ endif
 #	#
 #	# busybox init
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_PUREFTPD_STARTSCRIPT
 	@$(call install_alternative, pureftpd, 0, 0, 0755, /etc/init.d/pureftpd)
 
@@ -133,7 +132,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_PUREFTPD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_PUREFTPD_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_PUREFTPD_SYSTEMD_UNIT
 	@$(call install_alternative, pureftpd, 0, 0, 0644, \
diff --git a/rules/rng-tools.in b/rules/rng-tools.in
index b09fb21f4..9345ab9fb 100644
--- a/rules/rng-tools.in
+++ b/rules/rng-tools.in
@@ -20,7 +20,7 @@ if RNG_TOOLS
 config RNG_TOOLS_STARTSCRIPT
 	bool
 	default y
-	depends on RNG_TOOLS
+	depends on RNG_TOOLS && INITMETHOD_BBINIT
 	prompt "install /etc/init.d/rngd"
 
 config RNG_TOOLS_SYSTEMD_UNIT
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
index 5407fe9b9..6c81543ea 100644
--- a/rules/rng-tools.make
+++ b/rules/rng-tools.make
@@ -42,7 +42,6 @@ $(STATEDIR)/rng-tools.targetinstall:
 	@$(call install_fixup, rng-tools,DESCRIPTION,"random number generator daemon - seed kernel random from hwrng")
 
 	@$(call install_copy, rng-tools, 0, 0, 0755, -, /usr/sbin/rngd)
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_RNG_TOOLS_STARTSCRIPT
 	@$(call install_alternative, rng-tools, 0, 0, 0755, /etc/init.d/rngd)
 ifneq ($(call remove_quotes,$(PTXCONF_RNG_TOOLS_BBINIT_LINK)),)
@@ -51,7 +50,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_RNG_TOOLS_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_RNG_TOOLS_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_RNG_TOOLS_SYSTEMD_UNIT
 	@$(call install_alternative, rng-tools, 0, 0, 0644, \
 		/usr/lib/systemd/system/rngd.service)
diff --git a/rules/rsync.in b/rules/rsync.in
index d335b0a02..a20c5add5 100644
--- a/rules/rsync.in
+++ b/rules/rsync.in
@@ -56,6 +56,7 @@ endchoice
 config RSYNC_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT && RSYNC_STARTUP_TYPE_STANDALONE
 	prompt "install /etc/init.d/rsync"
 
 config RSYNC_INETD_STRING
diff --git a/rules/rsync.make b/rules/rsync.make
index 394b207ce..be5079168 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -66,8 +66,6 @@ $(STATEDIR)/rsync.targetinstall:
 	@$(call install_alternative, rsync, 0, 0, 0644, /etc/rsyncd.conf, n)
 	@$(call install_alternative, rsync, 0, 0, 0644, /etc/rsyncd.secrets, n)
 
-ifdef PTXCONF_RSYNC_STARTUP_TYPE_STANDALONE
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_RSYNC_STARTSCRIPT
 	@$(call install_alternative, rsync, 0, 0, 0755, /etc/init.d/rsyncd, n)
 	@$(call install_replace, rsync, /etc/init.d/rsyncd, \
@@ -80,8 +78,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_RSYNC_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_RSYNC_BBINIT_LINK))
 endif
 endif
-endif
-endif
 
 ifdef PTXCONF_RSYNC_INETD_SERVER
 	@$(call install_alternative, rsync, 0, 0, 0644, /etc/inetd.conf.d/rsync, n)
diff --git a/rules/rsync3.in b/rules/rsync3.in
index 0affd7661..856a282c3 100644
--- a/rules/rsync3.in
+++ b/rules/rsync3.in
@@ -19,6 +19,7 @@ if RSYNC3
 config RSYNC3_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/rsync"
 
 config RSYNC3_ACL
diff --git a/rules/rsync3.make b/rules/rsync3.make
index 675488cff..12188551a 100644
--- a/rules/rsync3.make
+++ b/rules/rsync3.make
@@ -75,7 +75,6 @@ $(STATEDIR)/rsync3.targetinstall:
 	# busybox init
 	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_RSYNC3_STARTSCRIPT
 	@$(call install_alternative, rsync3, 0, 0, 0755, /etc/init.d/rsyncd, n)
 
@@ -84,7 +83,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_RSYNC3_BBINIT_LINK)),)
 		../init.d/rsyncd, \
 		/etc/rc.d/$(PTXCONF_RSYNC3_BBINIT_LINK))
 endif
-endif
 endif
 	@$(call install_finish, rsync3)
 	@$(call touch)
diff --git a/rules/samba.make b/rules/samba.make
index 43fe4c597..24bae1d1b 100644
--- a/rules/samba.make
+++ b/rules/samba.make
@@ -196,7 +196,6 @@ endif
 #	#
 #	# busybox init
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_SAMBA_STARTSCRIPT
 	@$(call install_alternative, samba, 0, 0, 0755, /etc/init.d/samba)
 
@@ -206,7 +205,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_SAMBA_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_SAMBA_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_SAMBA_SYSTEMD_UNIT
 	@$(call install_alternative, samba, 0, 0, 0644, \
diff --git a/rules/syslogng.in b/rules/syslogng.in
index 92c128dbd..e75444d65 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -93,6 +93,7 @@ config SYSLOGNG_SYSTEMD
 config SYSLOGNG_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	help
 	  Installs (if present) the
 	  "./projectroot/etc/init.d/syslog-ng" startscript from your
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 2236703cd..feaa7bee1 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -130,7 +130,6 @@ ifdef PTXCONF_SYSLOGNG_CONFIG
 endif
 
 #	# bb init: start scripts
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_SYSLOGNG_STARTSCRIPT
 	@$(call install_alternative, syslogng, 0, 0, 0755, /etc/init.d/syslog-ng, n)
 
@@ -140,7 +139,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_SYSLOGNG_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_SYSLOGNG_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_INITMETHOD_SYSTEMD
 ifdef PTXCONF_SYSLOGNG_SYSTEMD
diff --git a/rules/thttpd.make b/rules/thttpd.make
index 58fd16d77..05408bb48 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -59,7 +59,6 @@ $(STATEDIR)/thttpd.targetinstall:
 
 	@$(call install_copy, thttpd, 0, 0, 0755, -, /usr/sbin/thttpd)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_THTTPD_STARTSCRIPT
 	@$(call install_alternative, thttpd, 0, 0, 0755, /etc/init.d/thttpd, n)
 
@@ -69,7 +68,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_THTTPD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_THTTPD_BBINIT_LINK))
 endif
 endif
-endif
 
 ifdef PTXCONF_THTTPD__GENERIC_SITE
 	@$(call install_copy, thttpd, 12, 102, 0755, /var/www)
diff --git a/rules/udev.make b/rules/udev.make
index 4b067f519..9cb359017 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -138,7 +138,6 @@ ifdef PTXCONF_UDEV_LEGACY_LIBUDEV
 endif
 
 ifdef PTXCONF_UDEV_LEGACY_STARTSCRIPT
-ifdef PTXCONF_INITMETHOD_BBINIT
 	@$(call install_alternative, udev, 0, 0, 0755, /etc/init.d/udev)
 
 ifneq ($(call remove_quotes,$(PTXCONF_UDEV_BBINIT_LINK)),)
@@ -146,7 +145,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_UDEV_BBINIT_LINK)),)
 		../init.d/udev, \
 		/etc/rc.d/$(PTXCONF_UDEV_BBINIT_LINK))
 endif
-endif
 endif
 	@$(call install_finish, udev)
 
diff --git a/rules/urshd.in b/rules/urshd.in
index 88231cd5c..8bdeaa480 100644
--- a/rules/urshd.in
+++ b/rules/urshd.in
@@ -17,6 +17,7 @@ if URSHD
 config URSHD_STARSCRIPT
 	bool
 	prompt "install startscript"
+	depends on INITMETHOD_BBINIT
 	select BUSYBOX_START_STOP_DAEMON if BUSYBOX
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS if BUSYBOX_START_STOP_DAEMON
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY if BUSYBOX_START_STOP_DAEMON
diff --git a/rules/urshd.make b/rules/urshd.make
index c9b66f1d9..d03fa89f2 100644
--- a/rules/urshd.make
+++ b/rules/urshd.make
@@ -51,12 +51,10 @@ $(STATEDIR)/urshd.targetinstall:
 	@$(call install_copy, urshd, 0, 0, 0755, -, \
 		/usr/bin/urshd)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_URSHD_STARSCRIPT
 	@$(call install_copy, urshd, 0, 0, 0755, /etc/init.d)
 	@$(call install_alternative, urshd, 0, 0, 0755, /etc/init.d/urshd)
 endif
-endif
 ifdef PTXCONF_URSHD_SYSTEMD_UNIT
 	@$(call install_alternative, urshd, 0, 0, 0644, \
 		/usr/lib/systemd/system/urshd.service)
diff --git a/rules/utelnetd.in b/rules/utelnetd.in
index 012713b64..33ccec215 100644
--- a/rules/utelnetd.in
+++ b/rules/utelnetd.in
@@ -11,6 +11,7 @@ if UTELNETD
 config UTELNETD_STARTSCRIPT
 	bool
 	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/utelnetd"
 
 config UTELNETD_SYSTEMD_UNIT
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index 6aefa3991..0c920465b 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -51,7 +51,6 @@ $(STATEDIR)/utelnetd.targetinstall:
 	# busybox init
 	#
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_UTELNETD_STARTSCRIPT
 	@$(call install_alternative, utelnetd, 0, 0, 0755, /etc/init.d/telnetd, n)
 
@@ -61,7 +60,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_UTELNETD_BBINIT_LINK)),)
 		/etc/rc.d/$(PTXCONF_UTELNETD_BBINIT_LINK))
 endif
 endif
-endif
 ifdef PTXCONF_UTELNETD_SYSTEMD_UNIT
 	@$(call install_alternative, utelnetd, 0, 0, 0644, \
 		/usr/lib/systemd/system/utelnetd.service)
diff --git a/rules/weston.in b/rules/weston.in
index d5c60d59f..6b0cf227c 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -77,7 +77,8 @@ config WESTON_LAUNCH
 
 config WESTON_STARTSCRIPT
 	bool
-	default INITMETHOD_BBINIT
+	default y
+	depends on INITMETHOD_BBINIT
 	prompt "install /etc/init.d/weston-init"
 
 config WESTON_SYSTEMD
diff --git a/rules/weston.make b/rules/weston.make
index 89d10fedf..2bd11b4ef 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -166,7 +166,6 @@ ifdef PTXCONF_WESTON_SYSTEMD
 endif
 	@$(call install_lib, weston, 0, 0, 0644, weston/libexec_weston)
 
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_WESTON_STARTSCRIPT
 	@$(call install_alternative, weston, 0, 0, 0755, /etc/init.d/weston-init)
 ifneq ($(call remove_quotes,$(PTXCONF_WESTON_BBINIT_LINK)),)
@@ -174,7 +173,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_WESTON_BBINIT_LINK)),)
 		../init.d/weston-init, \
 		/etc/rc.d/$(PTXCONF_WESTON_BBINIT_LINK))
 endif
-endif
 endif
 
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-simple-im)
-- 
cgit v1.2.3