diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-16 14:33:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-16 14:35:56 +0000 |
| commit | e47172d6a82ba03449f131e8329f349f254662bb (patch) | |
| tree | af9cf3d66e4fd9ec406d3754936e84816eaaab47 | |
| parent | 69d4c4d6ef9554ab8dfe8eea1358deb9ebba5640 (diff) | |
| download | aports-e47172d6a82ba03449f131e8329f349f254662bb.tar.bz2 aports-e47172d6a82ba03449f131e8329f349f254662bb.tar.xz | |
main/mdadm: do no exit with error if all raids are already
ref #275
| -rw-r--r-- | main/mdadm/APKBUILD | 4 | ||||
| -rw-r--r-- | main/mdadm/mdadm-raid.initd | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD index b1d408243..f6efdc58d 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 d2479737c..73efbe8ef 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 $? } |