From 45f6b8fee784ac18fc12f93741ae63ea5ec34ba6 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 7 Feb 2022 21:45:46 +0000
Subject: [PATCH] Sync grubby-bls with Fedora

Resolves: #1949904
---
 grubby-bls  | 6 +++---
 grubby.spec | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/grubby-bls b/grubby-bls
index aa1f3a2..af0d82d 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -235,7 +235,7 @@ get_bls_args() {
     local opts=(${args})
 
     for opt in ${opts[*]}; do
-        if [[ $opt =~ ^\$ ]]; then
+        if [[ $opt = "\$kernelopts" ]]; then
             value="$(expand_var $opt)"
             args="$(echo ${args} | sed -e "s/${opt}/${value}/")"
         fi
@@ -641,12 +641,12 @@ Usage: grubby [OPTION...]
       --no-etc-grub-update                don't update the GRUB_CMDLINE_LINUX variable in /etc/default/grub
 
 Help options:
-  -?, --help                              Show this help message
+  -h, --help                              Show this help message
 
 EOF
 }
 
-OPTS="$(getopt -o c:i:b:? --long help,add-kernel:,args:,bad-image-okay,\
+OPTS="$(getopt -o hc:i:b:? --long help,add-kernel:,args:,bad-image-okay,\
 config-file:,copy-default,default-kernel,default-index,default-title,env:,\
 grub2,info:,initrd:,extra-initrd:,make-default,remove-args:,\
 remove-kernel:,set-default:,set-default-index:,title:,update-kernel:,zipl,\
diff --git a/grubby.spec b/grubby.spec
index 70b69ad..dd3b89b 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 54%{?dist}
+Release: 55%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -131,6 +131,10 @@ current boot environment.
  %{_mandir}/man8/*.8*
 
 %changelog
+* Mon Feb 07 2022 Robbie Harwood <rharwood@redhat.com> 8.40-55
+- Sync grubby-bls with Fedora
+- Resolves: #1949904
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.40-54
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688