mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
systemd-boot-cfg: add .conf suffix to default entry label
Since systemd v245 (commit 6cd12ebcfe459466257ea63022a32515d756e719), systemd-boot expects default entry to have the complete filename as value. LABELS from poky are by default without any suffixes like "boot install", so default entry does not have the .conf suffix as well and systemd-boot is not able to use this information and it's starting in any case the first entry. To be able to start another entry by default, .conf suffix is required. With this change, LABELS variable can still be used by other bootloaders and being used as description field. (From OE-Core rev: 1adf70729dafc9729e665986ad2e2250cbd25c5b) Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@mind.be> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
1d8d9b1f87
commit
e0494a64f1
@@ -35,7 +35,7 @@ python build_efi_cfg() {
|
||||
bb.fatal('Unable to open %s' % cfile)
|
||||
|
||||
cfgfile.write('# Automatically created by OE\n')
|
||||
cfgfile.write('default %s\n' % (labels.split()[0]))
|
||||
cfgfile.write('default %s.conf\n' % (labels.split()[0]))
|
||||
timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT')
|
||||
if timeout:
|
||||
cfgfile.write('timeout %s\n' % timeout)
|
||||
|
||||
Reference in New Issue
Block a user