Updating init scripts to have more robust grepping

The previous pattern could accidentally match on things like
'real_root=ZFS=node02-zp00/ROOT/rootfs' due to the 'ZFS=no'
substring.

Signed-off-by: Matthew Thode <mthode@mthode.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1837

diff --git a/etc/init.d/zfs.fedora.in b/etc/init.d/zfs.fedora.in
index 3cece9ba4b31cdff28cc1869076a174eadfe640e..178637800e5af89b9ffb702a4ac13bc18605fb57 100644 (file)
--- a/etc/init.d/zfs.fedora.in
+++ b/etc/init.d/zfs.fedora.in
@@ -27,7 +27,7 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 
 if [ -z "$init" ]; then
     # Not interactive
-    grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3
+    grep -qE '(^|[^\\](\\\\)* )zfs=(off|no)( |$)' /proc/cmdline && exit 3
 fi
 
 # Source function library & LSB routines

diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
index 0034e02ba2649046d258531bc2c6e71a81739d0e..01a7731f7ec5df42f5550fa182650ea78493a931 100644 (file)
--- a/etc/init.d/zfs.gentoo.in
+++ b/etc/init.d/zfs.gentoo.in
@@ -5,7 +5,7 @@
 
 if [ -z "$init" ]; then
     # Not interactive
-    grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3
+    grep -qE '(^|[^\\](\\\\)* )zfs=(off|no)( |$)' /proc/cmdline && exit 3
 fi
 
 depend()

diff --git a/etc/init.d/zfs.lsb.in b/etc/init.d/zfs.lsb.in
index 0d0ffb4c42a844ceaa223b686b801f05bbc306a0..24641485dc2f3aacf652f6243e55087599ac7440 100644 (file)
--- a/etc/init.d/zfs.lsb.in
+++ b/etc/init.d/zfs.lsb.in
@@ -38,7 +38,7 @@ ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 
 if [ -z "$init" ]; then
     # Not interactive
-    grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3
+    grep -qE '(^|[^\\](\\\\)* )zfs=(off|no)( |$)' /proc/cmdline && exit 3
 fi
 
 start()

diff --git a/etc/init.d/zfs.lunar.in b/etc/init.d/zfs.lunar.in
index 3cf79cea03cffd4c2c3f6257d676991aaf9d9cd5..7a51104c2647ca60521318c2d531b4d3cff46415 100644 (file)
--- a/etc/init.d/zfs.lunar.in
+++ b/etc/init.d/zfs.lunar.in
@@ -16,7 +16,7 @@ ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
 
 if [ -z "$init" ]; then
     # Not interactive
-    grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3
+    grep -qE '(^|[^\\](\\\\)* )zfs=(off|no)( |$)' /proc/cmdline && exit 3
 fi
 
 case $1 in

diff --git a/etc/init.d/zfs.redhat.in b/etc/init.d/zfs.redhat.in
index fb5187f05292eef9108e81c3cb35e0d1971befc3..227787d2239eb037d5c1d9f74a08c52395b2d480 100644 (file)
--- a/etc/init.d/zfs.redhat.in
+++ b/etc/init.d/zfs.redhat.in
@@ -27,7 +27,7 @@ export PATH=/usr/local/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 
 if [ -z "$init" ]; then
     # Not interactive
-    grep -Eqi 'zfs=off|zfs=no' /proc/cmdline && exit 3
+    grep -qE '(^|[^\\](\\\\)* )zfs=(off|no)( |$)' /proc/cmdline && exit 3
 fi
 
 # Source function library & LSB routines