summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-16 14:33:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-16 14:37:52 +0000
commit697b99fd2eb775ae86b698377284cf219f29ddb2 (patch)
tree6b2720d4c2071f350afa131f62275be1a09e9a98 /main
parentb73646786d4ad36502cc05b1aba954de35d0f5b4 (diff)
downloadaports-697b99fd2eb775ae86b698377284cf219f29ddb2.tar.bz2
aports-697b99fd2eb775ae86b698377284cf219f29ddb2.tar.xz
main/mdadm: do no exit with error if all raids are already
ref #275 (cherry picked from commit e47172d6a82ba03449f131e8329f349f254662bb)
Diffstat (limited to 'main')
-rw-r--r--main/mdadm/APKBUILD4
-rw-r--r--main/mdadm/mdadm-raid.initd6
2 files changed, 6 insertions, 4 deletions
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index b1d40824..f6efdc58 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mdadm
pkgver=3.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="a tool for managing Linux Software RAID arrays"
url="http://neil.brown.name/blog/mdadm"
license="GPL-2"
@@ -35,5 +35,5 @@ package() {
md5sums="8bfeea282d21b5ef8e825122fb359457 mdadm-3.1.1.tar.gz
ce57e798431f7ab89f9b07a7daaa4852 mdadm.initd
16d2b8eb2e17184357db503470fdd8eb mdadm.confd
-974e3496d2e4b7c9c17c3279388f45ae mdadm-raid.initd
+af5bb6e1479bf1d27cf50521af82dae1 mdadm-raid.initd
aa601f072096fb8bae8b8946f59a561f mdadm-uclibc.patch"
diff --git a/main/mdadm/mdadm-raid.initd b/main/mdadm/mdadm-raid.initd
index d2479737..73efbe8e 100644
--- a/main/mdadm/mdadm-raid.initd
+++ b/main/mdadm/mdadm-raid.initd
@@ -11,11 +11,13 @@ start() {
# start all devices that are not already started
[ -f /proc/mdstat ] || modprobe -k md > /dev/null 2>&1
local tostart=
- ebegin "Starting RAID devices"
for i in $(awk '{print $2}' /etc/mdadm.conf); do
[ -b "$i" ] && continue
tostart="$tostart $i"
- done
+ done
+ [ -z "$tostart" ] && return 0
+
+ ebegin "Starting RAID devices"
mdadm --assemble --scan --quiet $tostart
eend $?
}