From c00cc2a98b99170c1f4a00269a58498554227bda Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 Feb 2023 10:30:09 -0800 Subject: [PATCH] Backport #1310 to disable persistence again, it's busted (#2170544) --- ....d-99-generic-live-Enable-automatic-.patch | 144 ++++++++++++++++++ lorax.spec | 9 +- 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch diff --git a/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch new file mode 100644 index 0000000..32d69ed --- /dev/null +++ b/0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch @@ -0,0 +1,144 @@ +From 55aabe2102263465e4ecb8274697bab22cae780c Mon Sep 17 00:00:00 2001 +From: Adam Williamson +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 + diff --git a/lorax.spec b/lorax.spec index 25683d1..44e6f73 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -19,6 +19,10 @@ Source0: %{name}-%{version}.tar.gz # https://github.com/weldr/lorax/pull/1309 # https://pagure.io/releng/failed-composes/issue/4611 Patch0: 0001-Strip-some-things-from-gtk4.patch +# Disable default persistence, it's busted: +# https://bugzilla.redhat.com/show_bug.cgi?id=2170544 +# https://github.com/weldr/lorax/pull/1310 +Patch1: 0001-Revert-templates.d-99-generic-live-Enable-automatic-.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -173,6 +177,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Thu Feb 16 2023 Adam Williamson - 38.6-3 +- Backport PR #1310 to disable persistence again, it's busted (#2170544) + * Wed Feb 15 2023 Adam Williamson - 38.6-2 - Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose