summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-07-26 15:32:52 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-07-27 15:24:01 +0200
commita29390253c505cc319307f11c6c0f00d9ca1490f (patch)
tree9de370a10c35608468d131356b1dbd2a902fa004
parenta34de6c4b5149b09d54bb0b98c76d7c190820bb5 (diff)
downloadptxdist-a29390253c505cc319307f11c6c0f00d9ca1490f.tar.gz
ptxdist-a29390253c505cc319307f11c6c0f00d9ca1490f.tar.xz
[lvm2] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/initmethod-bbinit.in6
-rw-r--r--rules/initmethod-bbinit.make6
-rw-r--r--rules/lvm2-bbinit.in8
-rw-r--r--rules/lvm2.make6
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 1259d6569..11213ccdd 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -119,12 +119,6 @@ config INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH
prompt "rt-set-bandwidth"
default "S03rt-set-bandwidth"
-config INITMETHOD_BBINIT_LINK_LVM2
- string
- depends on LVM2_STARTSCRIPT
- prompt "lvm2"
- default "S20lvm2"
-
config INITMETHOD_BBINIT_LINK_DIBBLER_SERVER
string
depends on DIBBLER_SERVER_STARTSCRIPT
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index 4e1bf95fd..1c093edb9 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -197,12 +197,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH)),
/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH))
endif
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_LVM2)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/lvm2, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_LVM2))
-endif
-
ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_SERVER)),)
@$(call install_link, initmethod-bbinit, \
../init.d/dibbler-server, \
diff --git a/rules/lvm2-bbinit.in b/rules/lvm2-bbinit.in
new file mode 100644
index 000000000..23f05f7d3
--- /dev/null
+++ b/rules/lvm2-bbinit.in
@@ -0,0 +1,8 @@
+## SECTION=initmethod_bbinit
+
+config LVM2_BBINIT_LINK
+ string
+ depends on LVM2_STARTSCRIPT
+ prompt "lvm2"
+ default "S20lvm2"
+
diff --git a/rules/lvm2.make b/rules/lvm2.make
index 31eb597a7..5fd2722e8 100644
--- a/rules/lvm2.make
+++ b/rules/lvm2.make
@@ -122,6 +122,12 @@ $(STATEDIR)/lvm2.targetinstall:
ifdef PTXCONF_LVM2_STARTSCRIPT
@$(call install_alternative, lvm2, 0, 0, 0755, /etc/init.d/lvm2)
+
+ifneq ($(call remove_quotes,$(PTXCONF_LVM2_BBINIT_LINK)),)
+ @$(call install_link, lvm2, \
+ ../init.d/lvm2, \
+ /etc/rc.d/$(PTXCONF_LVM2_BBINIT_LINK))
+endif
endif
@$(call install_finish, lvm2)