]> git.ipfire.org Git - thirdparty/systemd.git/commit
bootctl: load /etc/kernel/install.conf's $layout field, too
authorLennart Poettering <lennart@poettering.net>
Thu, 17 Mar 2022 16:16:32 +0000 (17:16 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 21 Mar 2022 22:54:33 +0000 (23:54 +0100)
commitb72676e7a095a3b46c631e9e95458c2dd09cd45d
tree22f385943f6598c930005552e754b10a79ff9289
parentea29abece9c80e56f6fd72abd041f274f1f687de
bootctl: load /etc/kernel/install.conf's $layout field, too

bootctl so far tried to determine the layout from /etc/machine-info, but
that's obsolete, and the kernel-install script never looked there. Let's
read the setting from /etc/kernel/install.conf instead, where
kernel-install actually looks.

Support for reading the field from /etc/machine-info is retained for
compat.

This means we'll now read /etc/machine-id, /etc/machine-info and
/etc/kernel/install.conf, and read the machine ID from the former too
and the layout setting from the latter two.
src/boot/bootctl.c