diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-26 14:03:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-27 15:23:57 +0200 |
| commit | 42c0c83ac208b5989cf730c2c12a6fd96227ce4c (patch) | |
| tree | b3a13b4eb98aca4c8c9feb3b308db7b782ff471e /rules | |
| parent | ee6703e5def20e023399c6e4feece637fd17e64c (diff) | |
| download | ptxdist-42c0c83ac208b5989cf730c2c12a6fd96227ce4c.tar.gz ptxdist-42c0c83ac208b5989cf730c2c12a6fd96227ce4c.tar.xz | |
[dropbear] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/dropbear-bbinit.in | 8 | ||||
| -rw-r--r-- | rules/dropbear.make | 6 | ||||
| -rw-r--r-- | rules/initmethod-bbinit.in | 6 | ||||
| -rw-r--r-- | rules/initmethod-bbinit.make | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/dropbear-bbinit.in b/rules/dropbear-bbinit.in new file mode 100644 index 000000000..c8ad73e4c --- /dev/null +++ b/rules/dropbear-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config DROPBEAR_BBINIT_LINK + string + depends on DROPBEAR_STARTSCRIPT + prompt "dropbear" + default "S16dropbear" + diff --git a/rules/dropbear.make b/rules/dropbear.make index 62c569ff8..2ca3c6cee 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -282,6 +282,12 @@ ifdef PTXCONF_DROPBEAR_STARTSCRIPT @$(call install_alternative, dropbear, 0, 0, 0755, /etc/rc.once.d/dropbear, n) @$(call install_replace, dropbear, /etc/rc.once.d/dropbear, \ @KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR)) + +ifneq ($(call remove_quotes,$(PTXCONF_DROPBEAR_BBINIT_LINK)),) + @$(call install_link, dropbear, \ + ../init.d/dropbear, \ + /etc/rc.d/$(PTXCONF_DROPBEAR_BBINIT_LINK)) +endif endif endif diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index 97254c1bd..3d2c6035f 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -59,12 +59,6 @@ menu "service startup configuration " source "generated/initmethod_bbinit.in" -config INITMETHOD_BBINIT_LINK_DROPBEAR - string - depends on DROPBEAR_STARTSCRIPT - prompt "dropbear" - default "S16dropbear" - config INITMETHOD_BBINIT_LINK_INETD string depends on BUSYBOX_INETD_STARTSCRIPT || INETUTILS_INETD_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index 83bd006b5..eadeebd6a 100644 --- a/rules/initmethod-bbinit.make +++ b/rules/initmethod-bbinit.make @@ -137,12 +137,6 @@ endif # # collect start links # # -ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_DROPBEAR)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/dropbear, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_DROPBEAR)) -endif - ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_INETD)),) @$(call install_link, initmethod-bbinit, \ ../init.d/inetd, \ |