diff options
author | Seblu <seblu@seblu.net> | 2011-02-24 04:18:10 +0100 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2011-02-27 11:52:59 +0100 |
commit | 8b2bfa7bd0073a3a9d389242faf16483c9ec5336 (patch) | |
tree | c6d5f050562c7d8a520e24b478375ac0fa69f60c | |
parent | d1e9a3deff2d432bb8f39cd94bf27182cb67948c (diff) | |
download | initscripts-8b2bfa7bd0073a3a9d389242faf16483c9ec5336.tar.xz |
Software RAID detection is now triggered via USEMDADM config var like fakeraid and lvm
-rw-r--r-- | rc.conf | 3 | ||||
-rwxr-xr-x | rc.sysinit | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -36,6 +36,9 @@ USECOLOR="yes" MOD_AUTOLOAD="yes" MODULES=() +# Scan for SoftRAID (mdadm) Volumes at startup +USEMDADM="no" + # Scan for FakeRAID (dmraid) Volumes at startup USEDMRAID="no" @@ -112,9 +112,9 @@ run_hook sysinit_udevsettled [[ -d /sys/class/net/lo ]] && \ status "Bringing up loopback interface" /sbin/ifconfig lo 127.0.0.1 up -# If necessary, find md devices and manually assemble RAID arrays -if [[ -f /etc/mdadm.conf ]] && /bin/grep -q ^ARRAY /etc/mdadm.conf; then - status "Activating RAID arrays" /sbin/mdadm --assemble --scan +# SoftRAID devices detection +if [[ $USEMDADM =~ yes|YES && -x /sbin/mdadm ]]; then + status "Activating SoftRAID arrays" /sbin/mdadm --assemble --scan fi # FakeRAID devices detection |