Merge pull request #336 from jpculp/hmac-bugfix

imghelper: remove full path from .vmlinuz.hmac
bottlerocket-os · Jul 26, 2024 · e2a9fa6 · e2a9fa6
2 parents 0e3b651 + 84d0c29
commit e2a9fa6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/twoliter/embedded/imghelper b/twoliter/embedded/imghelper
@@ -478,6 +478,7 @@ sbsetup_signing_profile() {
 undo_sign() {
   local what
   what="${1:?}"
+  # shellcheck disable=SC2076 # literal match is intended.
   if [[ ! "$(pesign -i "${what}" -l)" =~ 'No signatures found.' ]]; then
     mv "${what}" "${what}.orig"
     pesign -i "${what}.orig" -o "${what}" -u 0 -r
@@ -574,7 +575,7 @@ generate_hmac() {
   local vmlinuz
   vmlinuz="${1:?}"
   openssl sha512 -hmac FIPS-FTW-RHT2009 -hex "${vmlinuz}" |
-    awk -v vmlinuz="${vmlinuz}" '{ print $2 "  " vmlinuz }' \
+    awk '{ print $2 "  vmlinuz" }' \
       >"${vmlinuz%/*}/.${vmlinuz##*/}.hmac"
 }