dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0203-Fix-coverity-issues-in-shell-scripts-1226325.patch

28f7f8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
23d2ea
From: Robert Marshall <rmarshall@redhat.com>
23d2ea
Date: Thu, 7 Jul 2016 15:05:26 -0400
28f7f8
Subject: [PATCH] Fix coverity issues in shell scripts (#1226325)
23d2ea
23d2ea
Remove unused variables called out by coverity. Convert a non-quoted
23d2ea
variable to a quoted variable without use of deprecated backticks.
23d2ea
23d2ea
Related: rhbz#1226325
23d2ea
---
23d2ea
 util/grub-get-kernel-settings.in | 9 ---------
23d2ea
 util/grub-mkconfig.in            | 2 +-
23d2ea
 2 files changed, 1 insertion(+), 10 deletions(-)
23d2ea
23d2ea
diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
28f7f8
index ae0b4696d49..cee8c209650 100644
23d2ea
--- a/util/grub-get-kernel-settings.in
23d2ea
+++ b/util/grub-get-kernel-settings.in
23d2ea
@@ -21,27 +21,18 @@ prefix="@prefix@"
23d2ea
 exec_prefix="@exec_prefix@"
23d2ea
 datarootdir="@datarootdir@"
23d2ea
 
23d2ea
-prefix="@prefix@"
23d2ea
 exec_prefix="@exec_prefix@"
23d2ea
 sbindir="@sbindir@"
23d2ea
 bindir="@bindir@"
23d2ea
-sysconfdir="@sysconfdir@"
23d2ea
 PACKAGE_NAME=@PACKAGE_NAME@
23d2ea
 PACKAGE_VERSION=@PACKAGE_VERSION@
23d2ea
-host_os=@host_os@
23d2ea
 datadir="@datadir@"
23d2ea
 if [ "x$pkgdatadir" = x ]; then
23d2ea
     pkgdatadir="${datadir}/@PACKAGE@"
23d2ea
 fi
23d2ea
-grub_cfg=""
23d2ea
 
23d2ea
 self=`basename $0`
23d2ea
 
23d2ea
-grub_probe="${sbindir}/@grub_probe@"
23d2ea
-grub_file="${bindir}/@grub_file@"
23d2ea
-grub_editenv="${bindir}/@grub_editenv@"
23d2ea
-grub_script_check="${bindir}/@grub_script_check@"
23d2ea
-
23d2ea
 export TEXTDOMAIN=@PACKAGE@
23d2ea
 export TEXTDOMAINDIR="@localedir@"
23d2ea
 
23d2ea
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
28f7f8
index aa4fdb8a3b2..86801aa4e5c 100644
23d2ea
--- a/util/grub-mkconfig.in
23d2ea
+++ b/util/grub-mkconfig.in
23d2ea
@@ -149,7 +149,7 @@ if test -f ${sysconfdir}/default/grub ; then
23d2ea
   . ${sysconfdir}/default/grub
23d2ea
 fi
23d2ea
 
23d2ea
-eval `${grub_get_kernel_settings}` || true
23d2ea
+eval "$("${grub_get_kernel_settings}")" || true
23d2ea
 
23d2ea
 if [ "x$GRUB_DISABLE_UUID" != "xtrue" -a -z "$GRUB_DEVICE_UUID" ]; then
23d2ea
   GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"