From 8059a59583c56cd1e2199c37f9fc84d84e216a31 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Fri, 29 Apr 2022 10:54:52 +1200
Subject: [PATCH] Make centos reset-bls-entries behave the same as rhel

This makes 03-reset-bls-entries consistent with rhel so that the glob
match is *.conf, and a check is added to ensure that a rename is
actually required.

Change-Id: I4adff43cf7d4f31d939e6ddf37ac8d162ccd0db7
---
 .../elements/centos/post-install.d/03-reset-bls-entries     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/diskimage_builder/elements/centos/post-install.d/03-reset-bls-entries b/diskimage_builder/elements/centos/post-install.d/03-reset-bls-entries
index 837618fa1..b6b347ce3 100755
--- a/diskimage_builder/elements/centos/post-install.d/03-reset-bls-entries
+++ b/diskimage_builder/elements/centos/post-install.d/03-reset-bls-entries
@@ -21,10 +21,12 @@ pushd /boot/loader/entries
 
 machine_id=$(</etc/machine-id)
 
-for entry in *; do
+for entry in *.conf; do
     new_entry=$(echo $entry | sed "s/^[a-f0-9]*/$machine_id/")
     echo "renaming $entry to $new_entry for new machine-id"
-    mv $entry $new_entry
+    if [[ $entry != $new_entry ]]; then
+        mv $entry $new_entry
+    fi
 done
 popd