diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-26 14:26:56 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-27 15:23:58 +0200 |
| commit | 72fec7a083bfbf377877f0b5dc790c3f4a720783 (patch) | |
| tree | 28701b38d83f9f7df87beb4d8af620012c56d161 | |
| parent | 304afc0151dce16e17e5cf0b03eab20ac89939af (diff) | |
| download | ptxdist-72fec7a083bfbf377877f0b5dc790c3f4a720783.tar.gz ptxdist-72fec7a083bfbf377877f0b5dc790c3f4a720783.tar.xz | |
[openssh] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/initmethod-bbinit.in | 6 | ||||
| -rw-r--r-- | rules/initmethod-bbinit.make | 6 | ||||
| -rw-r--r-- | rules/openssh-bbinit.in | 8 | ||||
| -rw-r--r-- | rules/openssh.make | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index ff0c48903..2f3b2078d 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -83,12 +83,6 @@ config INITMETHOD_BBINIT_LINK_HWCLOCK prompt "hwclock" default "S12hwclock" -config INITMETHOD_BBINIT_LINK_OPENSSH - string - depends on OPENSSH_SSHD_STARTSCRIPT - prompt "openssh" - default "S16openssh" - config INITMETHOD_BBINIT_LINK_PORTMAP string depends on PORTMAP_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index 376d8f516..48ad22e9f 100644 --- a/rules/initmethod-bbinit.make +++ b/rules/initmethod-bbinit.make @@ -161,12 +161,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK)),) /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK)) endif -ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_OPENSSH)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/openssh, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_OPENSSH)) -endif - ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_PORTMAP)),) @$(call install_link, initmethod-bbinit, \ ../init.d/portmapd, \ diff --git a/rules/openssh-bbinit.in b/rules/openssh-bbinit.in new file mode 100644 index 000000000..51327ee47 --- /dev/null +++ b/rules/openssh-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config OPENSSH_BBINIT_LINK + string + depends on OPENSSH_SSHD_STARTSCRIPT + prompt "openssh" + default "S16openssh" + diff --git a/rules/openssh.make b/rules/openssh.make index 72644db14..214a33c2e 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -93,6 +93,12 @@ ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT @$(call install_alternative, openssh, 0, 0, 0755, /etc/rc.once.d/openssh) @$(call install_alternative, openssh, 0, 0, 0755, /etc/init.d/openssh) + +ifneq ($(call remove_quotes,$(PTXCONF_OPENSSH_BBINIT_LINK)),) + @$(call install_link, openssh, \ + ../init.d/openssh, \ + /etc/rc.d/$(PTXCONF_OPENSSH_BBINIT_LINK)) +endif endif endif |