145 lines
9.3 KiB
Diff
145 lines
9.3 KiB
Diff
|
From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Williamson <awilliam@redhat.com>
|
||
|
|
Date: Thu, 16 Feb 2023 09:53:05 -0800
|
||
|
|
Subject: [PATCH] Revert "templates.d/99-generic/live: Enable automatic
|
||
|
|
persistence for live media"
|
||
|
|
|
||
|
|
This reverts commit 7bedf613db8fbaf38747146775f00a2042f8424e.
|
||
|
|
Initial testing indicates it's busted:
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2170544
|
||
|
|
---
|
||
|
|
.../live/config_files/aarch64/grub2-efi.cfg | 26 ++++---------------
|
||
|
|
.../live/config_files/x86/grub2-bios.cfg | 26 ++++---------------
|
||
|
|
.../live/config_files/x86/grub2-efi.cfg | 26 ++++---------------
|
||
|
|
3 files changed, 15 insertions(+), 63 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
||
|
|
index d4f7bf5e..c874547f 100644
|
||
|
|
--- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
||
|
|
+++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg
|
||
|
|
@@ -26,32 +26,16 @@ set timeout=60
|
||
|
|
search --no-floppy --set=root -l '@ISOLABEL@'
|
||
|
|
|
||
|
|
### BEGIN /etc/grub.d/10_linux ###
|
||
|
|
-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb
|
||
|
|
+menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
||
|
|
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
||
|
|
initrd @INITRDPATH@
|
||
|
|
}
|
||
|
|
-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
-}
|
||
|
|
-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb
|
||
|
|
+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
||
|
|
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
||
|
|
initrd @INITRDPATH@
|
||
|
|
}
|
||
|
|
submenu 'Troubleshooting -->' {
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
|
||
|
|
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb
|
||
|
|
initrd @INITRDPATH@
|
||
|
|
}
|
||
|
|
diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
|
||
|
|
index 486d8548..5987cf62 100644
|
||
|
|
--- a/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
|
||
|
|
+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-bios.cfg
|
||
|
|
@@ -17,32 +17,16 @@ set timeout=60
|
||
|
|
search --no-floppy --set=root -l '@ISOLABEL@'
|
||
|
|
|
||
|
|
### BEGIN /etc/grub.d/10_linux ###
|
||
|
|
-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb
|
||
|
|
+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
||
|
|
initrd @INITRDPATH@
|
||
|
|
}
|
||
|
|
-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
-}
|
||
|
|
-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb
|
||
|
|
+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
||
|
|
initrd @INITRDPATH@
|
||
|
|
}
|
||
|
|
submenu 'Troubleshooting -->' {
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb
|
||
|
|
- initrd @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb
|
||
|
|
initrd @INITRDPATH@
|
||
|
|
}
|
||
|
|
diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
|
||
|
|
index 7595571e..39069585 100644
|
||
|
|
--- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
|
||
|
|
+++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg
|
||
|
|
@@ -20,32 +20,16 @@ set timeout=60
|
||
|
|
search --no-floppy --set=root -l '@ISOLABEL@'
|
||
|
|
|
||
|
|
### BEGIN /etc/grub.d/10_linux ###
|
||
|
|
-menuentry 'Start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist quiet rhgb
|
||
|
|
+menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
||
|
|
initrdefi @INITRDPATH@
|
||
|
|
}
|
||
|
|
-menuentry 'Test this media & start @PRODUCT@ @VERSION@ with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.check quiet
|
||
|
|
- initrdefi @INITRDPATH@
|
||
|
|
-}
|
||
|
|
-menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 quiet rhgb
|
||
|
|
+menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
|
||
|
|
initrdefi @INITRDPATH@
|
||
|
|
}
|
||
|
|
submenu 'Troubleshooting -->' {
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ without automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb
|
||
|
|
- initrdefi @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode with automatic data persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist nomodeset quiet rhgb
|
||
|
|
- initrdefi @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Delete existing persistence & start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
- linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.overlay.overlayfs rd.live.overlay=LABEL=fedorapersist rd.live.overlay.reset=1 nomodeset quiet rhgb
|
||
|
|
- initrdefi @INITRDPATH@
|
||
|
|
- }
|
||
|
|
- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode without automatic persistence' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
+ menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
|
||
|
|
linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb
|
||
|
|
initrdefi @INITRDPATH@
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.39.1
|
||
|
|
|