From a9ce8e635ebac7e3924757c93a84619943862167 Mon Sep 17 00:00:00 2001

From: Pino Toscano <ptoscano@redhat.com>

Date: Tue, 22 Mar 2016 15:48:53 +0100

Subject: [PATCH] appliance: use bash features for string matching in files

Read the content of /proc/cmdline using bash features, and use its

[[ ... ]] expression to find texts in a variable.

This shaves off 5 grep invocations.

(cherry picked from commit bb5d30ab2af5720775c63179afdec3ad9efd510d)

---

 appliance/init | 12 +++++++-----

 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/appliance/init b/appliance/init

index 3b76486..fd56033 100755

--- a/appliance/init

+++ b/appliance/init

@@ -77,7 +77,9 @@ $UDEVD --daemon #--debug

 udevadm trigger

 udevadm settle --timeout=600

-if grep -sq selinux=1 /proc/cmdline; then

+cmdline=$(

+

+if [[ $cmdline == *selinux=1* ]]; then

   mount -t selinuxfs none /sys/fs/selinux

 fi

@@ -93,16 +95,16 @@ shopt -u nullglob

 hwclock -u -s

 # Parse the kernel command line.

-if grep -sq guestfs_verbose=1 /proc/cmdline; then

+if [[ $cmdline == *guestfs_verbose=1* ]]; then

     guestfs_verbose=1

 fi

-if grep -sq guestfs_network=1 /proc/cmdline; then

+if [[ $cmdline == *guestfs_network=1* ]]; then

     guestfs_network=1

 fi

-if grep -sq guestfs_rescue=1 /proc/cmdline; then

+if [[ $cmdline == *guestfs_rescue=1* ]]; then

     guestfs_rescue=1

 fi

-if grep -sq guestfs_noreboot=1 /proc/cmdline; then

+if [[ $cmdline == *guestfs_noreboot=1* ]]; then

     guestfs_noreboot=1

 fi

 eval `grep -Eo 'guestfs_channel=[^[:space:]]+' /proc/cmdline`

-- 

1.8.3.1