summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-07-26 15:43:10 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-07-27 15:24:02 +0200
commit1b47fa55b0b0682aef3db80994766f5c915f1034 (patch)
treecf30e5f52a8eecc1df8da679939acfb8b6185666
parent42b6481da4d1306af9344bffb09c6176ebd82f68 (diff)
downloadptxdist-1b47fa55b0b0682aef3db80994766f5c915f1034.tar.gz
ptxdist-1b47fa55b0b0682aef3db80994766f5c915f1034.tar.xz
[utelnetd] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/initmethod-bbinit.in2
-rw-r--r--rules/utelnetd-bbinit.in8
-rw-r--r--rules/utelnetd.make6
3 files changed, 15 insertions, 1 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 9268ab026..8ff4434d9 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -85,7 +85,7 @@ config INITMETHOD_BBINIT_LINK_HWCLOCK
config INITMETHOD_BBINIT_LINK_TELNETD
string
- depends on BUSYBOX_TELNETD_STARTSCRIPT || UTELNETD_STARTSCRIPT
+ depends on BUSYBOX_TELNETD_STARTSCRIPT
prompt "telnetd"
default "S16telnetd"
diff --git a/rules/utelnetd-bbinit.in b/rules/utelnetd-bbinit.in
new file mode 100644
index 000000000..1dabfd5c0
--- /dev/null
+++ b/rules/utelnetd-bbinit.in
@@ -0,0 +1,8 @@
+## SECTION=initmethod_bbinit
+
+config UTELNETD_BBINIT_LINK
+ string
+ depends on UTELNETD_STARTSCRIPT
+ prompt "telnetd"
+ default "S16telnetd"
+
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index f77d6f7ac..f86b218b6 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -74,6 +74,12 @@ $(STATEDIR)/utelnetd.targetinstall:
ifdef PTXCONF_INITMETHOD_BBINIT
ifdef PTXCONF_UTELNETD_STARTSCRIPT
@$(call install_alternative, utelnetd, 0, 0, 0755, /etc/init.d/telnetd, n)
+
+ifneq ($(call remove_quotes,$(PTXCONF_UTELNETD_BBINIT_LINK)),)
+ @$(call install_link, utelnetd, \
+ ../init.d/telnetd, \
+ /etc/rc.d/$(PTXCONF_UTELNETD_BBINIT_LINK))
+endif
endif
endif