diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-26 14:29:38 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-27 15:23:58 +0200 |
| commit | 65c208166131c822d4eef6c9152dbef34eec504e (patch) | |
| tree | cf6e5c5622c7f11fd60be2f20477376219ff3068 | |
| parent | b3e35cfe505a0cde32086940943c27125a4014d2 (diff) | |
| download | ptxdist-65c208166131c822d4eef6c9152dbef34eec504e.tar.gz ptxdist-65c208166131c822d4eef6c9152dbef34eec504e.tar.xz | |
[ppp] 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/ppp-bbinit.in | 8 | ||||
| -rw-r--r-- | rules/ppp.make | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index e7d652005..1d9429789 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_PPPD - string - depends on PPP_STARTSCRIPT - prompt "pppd" - default "S09pppd" - config INITMETHOD_BBINIT_LINK_PROFTPD string depends on PROFTPD_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index 30dc78af2..c767fa06b 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_PPPD)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/pppd, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_PPPD)) -endif - ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_PROFTPD)),) @$(call install_link, initmethod-bbinit, \ ../init.d/proftpd, \ diff --git a/rules/ppp-bbinit.in b/rules/ppp-bbinit.in new file mode 100644 index 000000000..4c7d9a2d7 --- /dev/null +++ b/rules/ppp-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config PPPD_BBINIT_LINK + string + depends on PPP_STARTSCRIPT + prompt "pppd" + default "S09pppd" + diff --git a/rules/ppp.make b/rules/ppp.make index 24f6f656c..591bb3613 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -181,6 +181,12 @@ ifdef PTXCONF_PPP_STARTSCRIPT @$(call install_alternative, ppp, 0, 0, 0755, /etc/init.d/pppd) @$(call install_replace, ppp, /etc/init.d/pppd, \ @PPPD_INTF@, $(PTXCONF_PPPD_INTF)) + +ifneq ($(call remove_quotes,$(PTXCONF_PPPD_BBINIT_LINK)),) + @$(call install_link, ppp, \ + ../init.d/pppd, \ + /etc/rc.d/$(PTXCONF_PPPD_BBINIT_LINK)) +endif endif endif |