diff options
| -rw-r--r-- | rules/initmethod-bbinit.in | 6 | ||||
| -rw-r--r-- | rules/initmethod-bbinit.make | 6 | ||||
| -rw-r--r-- | rules/mysql-bbinit.in | 8 | ||||
| -rw-r--r-- | rules/mysql.make | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index 0e0585e8c..d76e493b5 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_MYSQL - string - depends on MYSQL_STARTSCRIPT - prompt "mysql" - default "S95mysql" - config INITMETHOD_BBINIT_LINK_NFSD string depends on NFSUTILS_NFSD_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index 84a46dba1..595f3574f 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_MYSQL)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/mysql, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_MYSQL)) -endif - ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_NFSD)),) @$(call install_link, initmethod-bbinit, \ ../init.d/nfsd, \ diff --git a/rules/mysql-bbinit.in b/rules/mysql-bbinit.in new file mode 100644 index 000000000..bb8823d7e --- /dev/null +++ b/rules/mysql-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config MYSQL_BBINIT_LINK + string + depends on MYSQL_STARTSCRIPT + prompt "mysql" + default "S95mysql" + diff --git a/rules/mysql.make b/rules/mysql.make index 685f70c01..6ef8d4e12 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -355,6 +355,12 @@ $(STATEDIR)/mysql.targetinstall: ifdef PTXCONF_INITMETHOD_BBINIT ifdef PTXCONF_MYSQL_STARTSCRIPT @$(call install_alternative, mysql, 0, 0, 0755, /etc/init.d/mysql, n) + +ifneq ($(call remove_quotes,$(PTXCONF_MYSQL_BBINIT_LINK)),) + @$(call install_link, mysql, \ + ../init.d/mysql, \ + /etc/rc.d/$(PTXCONF_MYSQL_BBINIT_LINK)) +endif endif endif |