fgrep -> grep -F

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13259

diff --git a/config/kernel.m4 b/config/kernel.m4
index 639d18377123951287cf58bc21922fac4c998b9e..ec61e2c8f1765bdf2d108cd80298178a46775e61 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
        utsrelease1=$kernelbuild/include/linux/version.h
        utsrelease2=$kernelbuild/include/linux/utsrelease.h
        utsrelease3=$kernelbuild/include/generated/utsrelease.h
-       AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
+       AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
                utsrelease=$utsrelease1
-       ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
+       ], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
                utsrelease=$utsrelease2
-       ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
+       ], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
                utsrelease=$utsrelease3
        ])
 

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index d516f3d2969f3ddc912ddbf18413353fa9928f23..726b4b420c77097e57553f49ae63d2631c9ba3e2 100644 (file)
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
 ])
 
 AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
-       AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
+       AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
                [enable_invariants="yes"],
                [enable_invariants="no"])
 ])

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
index b413f6e9f98deb01fdafb38444bc6ed10613d77c..ccb97914968aeca113cf90f57824829b8df711d3 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
@@ -120,5 +120,5 @@ function check_while_waiting
 # Whether any vdev in the given pool is initializing
 function is_vdev_initializing # pool
 {
-       zpool status -i "$1" | grep 'initialized, started' >/dev/null
+       zpool status -i "$1" | grep -q 'initialized, started'
 }