diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-26 14:39:58 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-27 15:23:59 +0200 |
| commit | 6f17b1f29769e6586c8c0e6427cf10445b508961 (patch) | |
| tree | edb2075d29060c1fc43ec6c148616705ea8569fd | |
| parent | 50525b8ae2b5d261c935df07d75eec6eefb4d637 (diff) | |
| download | ptxdist-6f17b1f29769e6586c8c0e6427cf10445b508961.tar.gz ptxdist-6f17b1f29769e6586c8c0e6427cf10445b508961.tar.xz | |
[samba] 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/samba-bbinit.in | 8 | ||||
| -rw-r--r-- | rules/samba.make | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index b3bf68b4a..8629da1a9 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_SAMBA - string - depends on SAMBA_STARTSCRIPT - prompt "samba" - default "S95samba" - config INITMETHOD_BBINIT_LINK_SYSLOG_NG string depends on SYSLOGNG_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index a86c3a7ed..b60f6906b 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_SAMBA)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/samba, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_SAMBA)) -endif - ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_SYSLOG_NG)),) @$(call install_link, initmethod-bbinit, \ ../init.d/syslog-ng, \ diff --git a/rules/samba-bbinit.in b/rules/samba-bbinit.in new file mode 100644 index 000000000..c830d49eb --- /dev/null +++ b/rules/samba-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config SAMBA_BBINIT_LINK + string + depends on SAMBA_STARTSCRIPT + prompt "samba" + default "S95samba" + diff --git a/rules/samba.make b/rules/samba.make index e641ff1a9..02e45433c 100644 --- a/rules/samba.make +++ b/rules/samba.make @@ -184,6 +184,12 @@ endif ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_SAMBA_STARTSCRIPT @$(call install_alternative, samba, 0, 0, 0755, /etc/init.d/samba) + +ifneq ($(call remove_quotes,$(PTXCONF_SAMBA_BBINIT_LINK)),) + @$(call install_link, samba, \ + ../init.d/samba, \ + /etc/rc.d/$(PTXCONF_SAMBA_BBINIT_LINK)) +endif endif endif |