]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
kernel-install: Remove "Default" from list of suffixes checked
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 15 Dec 2021 12:58:24 +0000 (13:58 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 15 Dec 2021 13:00:31 +0000 (14:00 +0100)
This was an undocumented change in behavior introduced by
9e82a74cb0f08a288f9db228a0b5bec8a7188cdb. Previously, we only
checked for "Default" if we didn't find a machine ID. Let's make
sure we keep the previous behavior intact.

src/kernel-install/kernel-install

index 9999b86ed87c8dcb966e3594f90a5ec840d38f1b..f2d954f2dd409d9cb1fb9114db09ba392224e988 100755 (executable)
@@ -93,7 +93,7 @@ fi
 [ -z "$MACHINE_ID" ] && [ -f /etc/machine-id ] && [ "$(stat -fc %T /etc/machine-id)" != "tmpfs" ] && read -r MACHINE_ID < /etc/machine-id
 [ -z "$MACHINE_ID" ] && MACHINE_ID="Default"
 
-[ -z "$BOOT_ROOT" ] && for suff in "$MACHINE_ID" "Default" "loader/entries"; do
+[ -z "$BOOT_ROOT" ] && for suff in "$MACHINE_ID" "loader/entries"; do
     for pref in "/efi" "/boot/efi" "/boot"; do
         if [ -d "$pref/$suff" ]; then
             BOOT_ROOT="$pref"