From 0c6fadafd3da258ea1851633179d31eaef24776a Mon Sep 17 00:00:00 2001

From: Nikolai Kostrigin <nickel@altlinux.org>

Date: Mon, 15 Aug 2022 18:47:42 +0300

Subject: [PATCH] util/grub.d: switch from fgrep to grep -F

---

 util/grub.d/10_hurd.in      | 2 +-

 util/grub.d/10_kfreebsd.in  | 2 +-

 util/grub.d/10_linux.in     | 2 +-

 util/grub.d/20_linux_xen.in | 4 ++--

 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in

index 3663d360e..5c2946251 100644

--- a/util/grub.d/10_hurd.in

+++ b/util/grub.d/10_hurd.in

@@ -176,7 +176,7 @@ while [ "x$kernels" != "x" ] ; do

   hurd_entry "$kernel" advanced

   hurd_entry "$kernel" recovery

-  kernels=`echo $kernels | tr ' ' '\n' | fgrep -vx "$kernel" | tr '\n' ' '`

+  kernels=`echo $kernels | tr ' ' '\n' | grep -Fvx "$kernel" | tr '\n' ' '`

 done

 # If at least one kernel was found, then we need to

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in

index 199b20e16..99b7b72f2 100644

--- a/util/grub.d/10_kfreebsd.in

+++ b/util/grub.d/10_kfreebsd.in

@@ -239,7 +239,7 @@ while [ "x$list" != "x" ] ; do

     kfreebsd_entry "${OS}" "${version}" recovery "-s"

   fi

-  list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '`

+  list=`echo $list | tr ' ' '\n' | grep -Fvx "$kfreebsd" | tr '\n' ' '`

 done

 # If at least one kernel was found, then we need to

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

index e8b01c0d0..dcc6c236d 100644

--- a/util/grub.d/10_linux.in

+++ b/util/grub.d/10_linux.in

@@ -290,7 +290,7 @@ while [ "x$list" != "x" ] ; do

                 "single ${GRUB_CMDLINE_LINUX}"

   fi

-  list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`

+  list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '`

 done

 # If at least one kernel was found, then we need to

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

index 3b1f47049..a4551d112 100644

--- a/util/grub.d/20_linux_xen.in

+++ b/util/grub.d/20_linux_xen.in

@@ -346,12 +346,12 @@ while [ "x${xen_list}" != "x" ] ; do

 		"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"

 	fi

-	list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`

+	list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '`

     done

     if [ x"$is_top_level" != xtrue ]; then

 	echo '	}'

     fi

-    xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`

+    xen_list=`echo $xen_list | tr ' ' '\n' | grep -Fvx "$current_xen" | tr '\n' ' '`

 done

 # If at least one kernel was found, then we need to

-- 

2.33.4