summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-08-31 11:16:43 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-08-31 11:22:07 +0000
commit386db07f3ed3f3e7dec969389f22472d44d7946c (patch)
tree2efe7c9688c98602da78eb1ede0d03b502980148
parentff77079ba27c2375f9b1b7a68722a877185641ac (diff)
downloadaports-386db07f3ed3f3e7dec969389f22472d44d7946c.tar.bz2
aports-386db07f3ed3f3e7dec969389f22472d44d7946c.tar.xz
main/lvm2: init.d dependency fixes
make sure we start after fsck and after hwdrivers and modules. provide default config that starts lvm after mdadm-raid. fixes #148
-rw-r--r--main/lvm2/APKBUILD7
-rw-r--r--main/lvm2/lvm.confd5
-rw-r--r--main/lvm2/lvm.initd5
3 files changed, 15 insertions, 2 deletions
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index d9939174..4c7881e0 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lvm2
pkgver=2.02.48
-pkgrel=1
+pkgrel=2
pkgdesc="Logical Volume Manager 2 utilities"
url="http://sourceware.org/lvm2/"
license="GPL"
@@ -9,6 +9,7 @@ depends=
makedepends="readline-dev"
source="ftp://sources.redhat.com/pub/$pkgname/LVM2.$pkgver.tgz
lvm.initd
+ lvm.confd
"
subpackages="$pkgname-dev $pkgname-doc device-mapper:dm"
@@ -30,6 +31,7 @@ build () {
install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup
install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm
+ install -Dm644 "$srcdir"/lvm.confd "$pkgdir"/etc/conf.d/lvm
}
dm() {
@@ -40,4 +42,5 @@ dm() {
}
md5sums="0d24c2709f439eeca36261e5cea68330 LVM2.2.02.48.tgz
-e60d88f78eedb9c1252deb5b9b9b978b lvm.initd"
+6f65f902cf19f144a42b8d6aceadf395 lvm.initd
+ec36d5fe4561220304e406c5c797e71f lvm.confd"
diff --git a/main/lvm2/lvm.confd b/main/lvm2/lvm.confd
new file mode 100644
index 00000000..9d150f6e
--- /dev/null
+++ b/main/lvm2/lvm.confd
@@ -0,0 +1,5 @@
+# LVM should normally only be started after mdadm-raid is available
+# this is because LVM physical volumes are very often MD devices.
+
+rc_after="mdadm-raid"
+
diff --git a/main/lvm2/lvm.initd b/main/lvm2/lvm.initd
index 022cbb1e..f077d7f1 100644
--- a/main/lvm2/lvm.initd
+++ b/main/lvm2/lvm.initd
@@ -1,5 +1,10 @@
#!/sbin/runscript
+depend() {
+ before checkfs fsck
+ after hwdrivers modules device-mapper
+}
+
dm_in_proc() {
local rc=0 i=
for i in devices misc; do