[busybox] install rc.d link with the init script

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 62 insertions, 60 deletions

diff --git a/rules/busybox-bbinit.in b/rules/busybox-bbinit.in
new file mode 100644
index 000000000..86b69d538
--- /dev/null
+++ b/rules/busybox-bbinit.in
@@ -0,0 +1,32 @@
+## SECTION=initmethod_bbinit
+
+config BUSYBOX_INETD_BBINIT_LINK
+	string
+	depends on BUSYBOX_INETD_STARTSCRIPT
+	prompt "inetd"
+	default "S95inetd"
+
+config BUSYBOX_SYSLOGD_BBINIT_LINK
+	string
+	depends on BUSYBOX_SYSLOGD_STARTSCRIPT
+	prompt "syslogd"
+	default "S08syslogd"
+
+config BUSYBOX_CROND_BBINIT_LINK
+	string
+	depends on BUSYBOX_CROND_STARTSCRIPT
+	prompt "crond"
+	default "S10crond"
+
+config BUSYBOX_HWCLOCK_BBINIT_LINK
+	string
+	depends on BUSYBOX_HWCLOCK_STARTSCRIPT
+	prompt "hwclock"
+	default "S12hwclock"
+
+config BUSYBOX_TELNETD_BBINIT_LINK
+	string
+	depends on BUSYBOX_TELNETD_STARTSCRIPT
+	prompt "telnetd"
+	default "S16telnetd"
+
diff --git a/rules/busybox.make b/rules/busybox.make
index baf9ec69e..4c0a56ed8 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -110,22 +110,52 @@ endif
 ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_BUSYBOX_INETD_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/inetd)
+
+ifneq ($(call remove_quotes, $(PTXCONF_BUSYBOX_INETD_BBINIT_LINK)),)
+	@$(call install_link, busybox, \
+		../init.d/inetd, \
+		/etc/rc.d/$(PTXCONF_BUSYBOX_INETD_BBINIT_LINK))
+endif
 endif
 
 ifdef PTXCONF_BUSYBOX_TELNETD_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/telnetd)
+
+ifneq ($(call remove_quotes,$(PTXCONF_BUSYBOX_TELNETD_BBINIT_LINK)),)
+	@$(call install_link, busybox, \
+		../init.d/telnetd, \
+		/etc/rc.d/$(PTXCONF_BUSYBOX_TELNETD_BBINIT_LINK))
+endif
 endif
 
 ifdef PTXCONF_BUSYBOX_SYSLOGD_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/syslogd)
+
+ifneq ($(call remove_quotes, $(PTXCONF_BUSYBOX_SYSLOGD_BBINIT_LINK)),)
+	@$(call install_link, busybox, \
+		../init.d/syslogd, \
+		/etc/rc.d/$(PTXCONF_BUSYBOX_SYSLOGD_BBINIT_LINK))
+endif
 endif
 
 ifdef PTXCONF_BUSYBOX_CROND_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/crond)
+
+ifneq ($(call remove_quotes, $(PTXCONF_BUSYBOX_CROND_BBINIT_LINK)),)
+	@$(call install_link, busybox, \
+		../init.d/crond, \
+		/etc/rc.d/$(PTXCONF_BUSYBOX_CROND_BBINIT_LINK))
+endif
 endif
 
 ifdef PTXCONF_BUSYBOX_HWCLOCK_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/hwclock)
+
+ifneq ($(call remove_quotes, $(PTXCONF_BUSYBOX_HWCLOCK_BBINIT_LINK)),)
+	@$(call install_link, busybox, \
+		../init.d/hwclock, \
+		/etc/rc.d/$(PTXCONF_BUSYBOX_HWCLOCK_BBINIT_LINK))
+endif
 endif
 endif # PTXCONF_INITMETHOD_BBINIT
 
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 8ff4434d9..0d1af16ff 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -59,36 +59,6 @@ menu "service startup configuration "
 
 source "generated/initmethod_bbinit.in"
 
-config INITMETHOD_BBINIT_LINK_INETD
-	string
-	depends on BUSYBOX_INETD_STARTSCRIPT
-	prompt "inetd"
-	default "S95inetd"
-
-config INITMETHOD_BBINIT_LINK_SYSLOGD
-	string
-	depends on BUSYBOX_SYSLOGD_STARTSCRIPT
-	prompt "syslogd"
-	default "S08syslogd"
-
-config INITMETHOD_BBINIT_LINK_CROND
-	string
-	depends on BUSYBOX_CROND_STARTSCRIPT
-	prompt "crond"
-	default "S10crond"
-
-config INITMETHOD_BBINIT_LINK_HWCLOCK
-	string
-	depends on BUSYBOX_HWCLOCK_STARTSCRIPT
-	prompt "hwclock"
-	default "S12hwclock"
-
-config INITMETHOD_BBINIT_LINK_TELNETD
-	string
-	depends on BUSYBOX_TELNETD_STARTSCRIPT
-	prompt "telnetd"
-	default "S16telnetd"
-
 config INITMETHOD_BBINIT_LINK_BANNER
 	string
 	depends on INITMETHOD_BBINIT_ETC_INITD_BANNER
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index 587e5d4aa..cd67eb111 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -137,36 +137,6 @@ endif
 #	# collect start links
 #	#
 
-ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_INETD)),)
-	@$(call install_link, initmethod-bbinit, \
-		../init.d/inetd, \
-		/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_INETD))
-endif
-
-ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_SYSLOGD)),)
-	@$(call install_link, initmethod-bbinit, \
-		../init.d/syslogd, \
-		/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_SYSLOGD))
-endif
-
-ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_CROND)),)
-	@$(call install_link, initmethod-bbinit, \
-		../init.d/crond, \
-		/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_CROND))
-endif
-
-ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK)),)
-	@$(call install_link, initmethod-bbinit, \
-		../init.d/hwclock, \
-		/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK))
-endif
-
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_TELNETD)),)
-	@$(call install_link, initmethod-bbinit, \
-		../init.d/telnetd, \
-		/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_TELNETD))
-endif
-
 ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_BANNER)),)
 	@$(call install_link, initmethod-bbinit, \
 		../init.d/banner, \