summaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-06-19 09:04:24 -0400
committerDave Reisner <d@falconindy.com>2011-06-19 09:04:24 -0400
commitfe48fab2c2c35ccbfa3eec436d40739bc4b486da (patch)
tree25eb90cb1a2e417fb605255b43b94b5728501904 /rc.sysinit
parentf5d571110b9cfe45ecb32602510c924409e52d63 (diff)
rc.sysinit: avoid use of regex match for USE* vars
Although silly, this would positively match something such as USRBTRFS=deadeyes Instead, enumerate the match as a simple glob. Signed-off-by: Dave Reisner <d@falconindy.com>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit6
1 files changed, 3 insertions, 3 deletions
diff --git a/rc.sysinit b/rc.sysinit
index dd87633..8158f78 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -102,12 +102,12 @@ run_hook sysinit_udevsettled
status "Bringing up loopback interface" ip link set up dev lo
# FakeRAID devices detection
-if [[ $USEDMRAID =~ yes|YES && -x $(type -P dmraid) ]]; then
+if [[ $USEDMRAID = [Yy][Ee][Ss] && -x $(type -P dmraid) ]]; then
status "Activating FakeRAID arrays" dmraid -i -ay
fi
# BTRFS devices detection
-if [[ $USEBTRFS =~ yes|YES && -x $(type -P btrfs) ]]; then
+if [[ $USEBTRFS = [Yy][Ee][Ss] && -x $(type -P btrfs) ]]; then
status "Activating BTRFS volumes" btrfs device scan
fi
@@ -280,7 +280,7 @@ stat_busy "Mounting Local Filesystems"
stat_done
# enable monitoring of lvm2 groups, now that the filesystems are mounted rw
-if [[ $USELVM =~ yes|YES && -x $(type -P lvm) && -d /sys/block ]]; then
+if [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]]; then
status "Activating monitoring of LVM2 groups" \
vgchange --monitor y >/dev/null
fi