webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 01:12:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

grub cloud: Add kernel release to boot ID

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Michael Tremer
2021-07-27 10:07:10 +00:00
committed by Arne Fitzenreiter
parent dd730a395b
commit b8b36e969c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/grub2/00_cloud
View File

@@ -11,6 +11,10 @@ fi
. "${pkgdatadir}/grub-mkconfig_lib"
if [ -z "${KERNEL_RELEASE}" ]; then
KERNEL_RELEASE="$(uname -r)"
fi
if [ -z "${boot_device_id}" ]; then
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi
@@ -21,6 +25,6 @@ smbios --type 1 --get-string 4 --set system_manufacturer
# Are we on Amazon EC2?
if [ "\$system_manufacturer" = "Amazon EC2" ]; then
next_entry=gnulinux-serial-${boot_device_id}
next_entry=gnulinux-${KERNEL_RELEASE}-serial-${boot_device_id}
fi
EOF

2
lfs/flash-images
View File

@@ -188,7 +188,7 @@ ifeq "$(BOOTLOADER)" "grub"
# Create configuration
mkdir -pv $(MNThdd)/boot/grub
GRUB_FIRST_BOOT=true chroot $(MNThdd) \
GRUB_FIRST_BOOT=true KERNEL_RELEASE="$(KVER)-ipfire" chroot $(MNThdd) \
grub-mkconfig -o /boot/grub/grub.cfg
# Boot the first kernel by default