From 644aa78f3f97784b16f7482b51876ac693a6d702 Mon Sep 17 00:00:00 2001 From: luz Date: Sun, 4 May 2025 11:06:13 -0500 Subject: [PATCH] add correct bootloader for live sessions --- recipes/live-desktop-hypervisor.cfg | 4 +++- recipes/live-desktop.cfg | 4 +++- recipes/live-server-hypervisor.cfg | 4 +++- recipes/live-server.cfg | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/recipes/live-desktop-hypervisor.cfg b/recipes/live-desktop-hypervisor.cfg index e1f112d..1f7b7b5 100644 --- a/recipes/live-desktop-hypervisor.cfg +++ b/recipes/live-desktop-hypervisor.cfg @@ -16,8 +16,9 @@ %include ../ingredients/live-core-storage.cfg # For live systems only # Booloader. Exactly one option has to be picked -%include ../ingredients/core-bootloader-grub.cfg # GNU GRUB +# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB # %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot +%include ../ingredients/live-core-bootloader-grub.cfg # GNU GRUB for live systems # System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language @@ -59,6 +60,7 @@ # %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only +%include ../ingredients/live-core-post-live-session.cfg # Live session script ### End of pre and post section ### # OEM setup. Exactly one option has to be picked diff --git a/recipes/live-desktop.cfg b/recipes/live-desktop.cfg index 82b0dac..09c1503 100644 --- a/recipes/live-desktop.cfg +++ b/recipes/live-desktop.cfg @@ -16,8 +16,9 @@ %include ../ingredients/live-core-storage.cfg # For live systems only # Booloader. Exactly one option has to be picked -%include ../ingredients/core-bootloader-grub.cfg # GNU GRUB +# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB # %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot +%include ../ingredients/live-core-bootloader-grub.cfg # GNU GRUB for live systems # System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language @@ -59,6 +60,7 @@ # %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only +%include ../ingredients/live-core-post-live-session.cfg # Live session script ### End of pre and post section ### # OEM setup. Exactly one option has to be picked diff --git a/recipes/live-server-hypervisor.cfg b/recipes/live-server-hypervisor.cfg index 144eda6..da8f8c7 100644 --- a/recipes/live-server-hypervisor.cfg +++ b/recipes/live-server-hypervisor.cfg @@ -16,8 +16,9 @@ %include ../ingredients/live-core-storage.cfg # For live systems only # Booloader. Exactly one option has to be picked -%include ../ingredients/core-bootloader-grub.cfg # GNU GRUB +# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB # %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot +%include ../ingredients/live-core-bootloader-grub.cfg # GNU GRUB for live systems # System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language @@ -59,6 +60,7 @@ # %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only +%include ../ingredients/live-core-post-live-session.cfg # Live session script ### End of pre and post section ### # OEM setup. Exactly one option has to be picked diff --git a/recipes/live-server.cfg b/recipes/live-server.cfg index a9cc1ba..463cfbd 100644 --- a/recipes/live-server.cfg +++ b/recipes/live-server.cfg @@ -16,8 +16,9 @@ %include ../ingredients/live-core-storage.cfg # For live systems only # Booloader. Exactly one option has to be picked -%include ../ingredients/core-bootloader-grub.cfg # GNU GRUB +# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB # %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot +%include ../ingredients/live-core-bootloader-grub.cfg # GNU GRUB for live systems # System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language @@ -59,6 +60,7 @@ # %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only +%include ../ingredients/live-core-post-live-session.cfg # Live session script ### End of pre and post section ### # OEM setup. Exactly one option has to be picked