diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-15 13:58:24 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-15 14:00:31 +0100 |
| commit | 447a822f8ee47b63a4cae00423c4d407bfa5e516 (patch) | |
| tree | 5aeae6df012af60463994c2fc9db2a44e9a6fd0f /src/kernel-install | |
| parent | wait-online: also use address state even when operational state is below degr... (diff) | |
| download | systemd-447a822f8ee47b63a4cae00423c4d407bfa5e516.tar.xz systemd-447a822f8ee47b63a4cae00423c4d407bfa5e516.zip | |
kernel-install: Remove "Default" from list of suffixes checked
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.
Diffstat (limited to 'src/kernel-install')
| -rwxr-xr-x | src/kernel-install/kernel-install | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install index 9999b86ed8..f2d954f2dd 100755 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -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" |