diff --git a/1019-add-inst.xtimeout-1200.patch b/1019-add-inst.xtimeout-1200.patch new file mode 100644 index 0000000000000000000000000000000000000000..93a713360d3bcc282d74afcc51f0d0551bc30d1b --- /dev/null +++ b/1019-add-inst.xtimeout-1200.patch @@ -0,0 +1,266 @@ +From d352df57373c94a81357e54705b99f573dcf75ff Mon Sep 17 00:00:00 2001 +From: Yang_X_Y +Date: Thu, 8 Aug 2024 09:42:39 +0800 +Subject: [PATCH] add inst.xtimeout=1200 + +--- + 80-anolis/config_files/aarch64/grub.conf | 4 ++-- + 80-anolis/config_files/aarch64/grub2-efi.cfg | 8 ++++---- + 80-anolis/config_files/loongarch64/boot.cfg | 4 ++-- + 80-anolis/config_files/loongarch64/grub2-efi.cfg | 8 ++++---- + 80-anolis/config_files/ppc/grub.cfg.in | 6 +++--- + 80-anolis/config_files/s390/cdboot.prm | 2 +- + 80-anolis/config_files/x86/grub.conf | 4 ++-- + 80-anolis/config_files/x86/grub2-efi.cfg | 8 ++++---- + 80-anolis/config_files/x86/isolinux.cfg | 8 ++++---- + 80-anolis/efi.tmpl | 1 + + 80-anolis/s390.tmpl | 1 + + 80-anolis/x86.tmpl | 2 ++ + 12 files changed, 30 insertions(+), 26 deletions(-) + +diff --git a/80-anolis/config_files/aarch64/grub.conf b/80-anolis/config_files/aarch64/grub.conf +index 677e383..b5a167e 100644 +--- a/80-anolis/config_files/aarch64/grub.conf ++++ b/80-anolis/config_files/aarch64/grub.conf +@@ -5,9 +5,9 @@ timeout 60 + hiddenmenu + title Install @PRODUCT@ @VERSION@ + findiso +- kernel @KERNELPATH@ @ROOT@ quiet ++ kernel @KERNELPATH@ @ROOT@ quiet inst.xtimeout=1200 + initrd @INITRDPATH@ + title Test this media & install @PRODUCT@ @VERSION@ + findiso +- kernel @KERNELPATH@ @ROOT@ rd.live.check quiet ++ kernel @KERNELPATH@ @ROOT@ rd.live.check quiet inst.xtimeout=1200 + initrd @INITRDPATH@ +diff --git a/80-anolis/config_files/aarch64/grub2-efi.cfg b/80-anolis/config_files/aarch64/grub2-efi.cfg +index c8e794f..acede09 100644 +--- a/80-anolis/config_files/aarch64/grub2-efi.cfg ++++ b/80-anolis/config_files/aarch64/grub2-efi.cfg +@@ -27,20 +27,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ inst.rescue inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ inst.rescue inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + } +diff --git a/80-anolis/config_files/loongarch64/boot.cfg b/80-anolis/config_files/loongarch64/boot.cfg +index c07d6ea..6136273 100644 +--- a/80-anolis/config_files/loongarch64/boot.cfg ++++ b/80-anolis/config_files/loongarch64/boot.cfg +@@ -3,11 +3,11 @@ showmenu 1 + default 0 + + title Install @PRODUCT@ @VERSION@ (USB) +- kernel (usb0,0)@KERNELPATH@ ++ kernel (usb0,0)@KERNELPATH@ inst.xtimeout=1200 + initrd (usb0,0)@INITRDPATH@ + args @ROOT@ rhgb + + title Install @PRODUCT@ @VERSION@ (SATA-CD) +- kernel (cd0,0)@KERNELPATH@ ++ kernel (cd0,0)@KERNELPATH@ inst.xtimeout=1200 + initrd (cd0,0)@INITRDPATH@ + args @ROOT@ rhgb +diff --git a/80-anolis/config_files/loongarch64/grub2-efi.cfg b/80-anolis/config_files/loongarch64/grub2-efi.cfg +index c8e794f..acede09 100644 +--- a/80-anolis/config_files/loongarch64/grub2-efi.cfg ++++ b/80-anolis/config_files/loongarch64/grub2-efi.cfg +@@ -27,20 +27,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ inst.rescue inst.profile=anolis ++ linux @KERNELPATH@ @ROOT@ inst.rescue inst.profile=anolis inst.xtimeout=1200 + initrd @INITRDPATH@ + } + } +diff --git a/80-anolis/config_files/ppc/grub.cfg.in b/80-anolis/config_files/ppc/grub.cfg.in +index 1b14ede..c2fe8c6 100644 +--- a/80-anolis/config_files/ppc/grub.cfg.in ++++ b/80-anolis/config_files/ppc/grub.cfg.in +@@ -4,17 +4,17 @@ set timeout=60 + echo -e "\nWelcome to the @PRODUCT@ @VERSION@ installer!\n\n" + + menuentry "Install @PRODUCT@ @VERSION@ (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os { +- linux /ppc/ppc64/vmlinuz @ROOT@ ro ++ linux /ppc/ppc64/vmlinuz @ROOT@ ro inst.xtimeout=1200 + initrd /ppc/ppc64/initrd.img + } + + menuentry "Test this media & install @PRODUCT@ @VERSION@ (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os { +- linux /ppc/ppc64/vmlinuz @ROOT@ rd.live.check ro ++ linux /ppc/ppc64/vmlinuz @ROOT@ rd.live.check ro inst.xtimeout=1200 + initrd /ppc/ppc64/initrd.img + } + + menuentry "Rescue a @PRODUCT@ system (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os { +- linux /ppc/ppc64/vmlinuz @ROOT@ inst.rescue ro ++ linux /ppc/ppc64/vmlinuz @ROOT@ inst.rescue ro inst.xtimeout=1200 + initrd /ppc/ppc64/initrd.img + } + +diff --git a/80-anolis/config_files/s390/cdboot.prm b/80-anolis/config_files/s390/cdboot.prm +index 80c034b..f605ef5 100644 +--- a/80-anolis/config_files/s390/cdboot.prm ++++ b/80-anolis/config_files/s390/cdboot.prm +@@ -1 +1 @@ +-ro @ROOT@ ++ro @ROOT@ @TIMEOUT@ +diff --git a/80-anolis/config_files/x86/grub.conf b/80-anolis/config_files/x86/grub.conf +index 4cf8ced..e7490f4 100644 +--- a/80-anolis/config_files/x86/grub.conf ++++ b/80-anolis/config_files/x86/grub.conf +@@ -5,9 +5,9 @@ timeout 60 + hiddenmenu + title Install @PRODUCT@ @VERSION@ + findiso +- kernel @KERNELPATH@ @ROOT@ quiet ++ kernel @KERNELPATH@ @ROOT@ quiet @TIMEOUT@ + initrd @INITRDPATH@ + title Test this media & install @PRODUCT@ @VERSION@ + findiso +- kernel @KERNELPATH@ @ROOT@ rd.live.check quiet ++ kernel @KERNELPATH@ @ROOT@ rd.live.check quiet @TIMEOUT@ + initrd @INITRDPATH@ +diff --git a/80-anolis/config_files/x86/grub2-efi.cfg b/80-anolis/config_files/x86/grub2-efi.cfg +index 435c1a7..8634005 100644 +--- a/80-anolis/config_files/x86/grub2-efi.cfg ++++ b/80-anolis/config_files/x86/grub2-efi.cfg +@@ -21,20 +21,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ quiet inst.profile=anolis ++ linuxefi @KERNELPATH@ @ROOT@ quiet inst.profile=anolis inst.xtimeout=1200 + initrdefi @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet inst.profile=anolis ++ linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet inst.profile=anolis inst.xtimeout=1200 + initrdefi @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet inst.profile=anolis ++ linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet inst.profile=anolis inst.xtimeout=1200 + initrdefi @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet inst.profile=anolis ++ linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet inst.profile=anolis inst.xtimeout=1200 + initrdefi @INITRDPATH@ + } + } +diff --git a/80-anolis/config_files/x86/isolinux.cfg b/80-anolis/config_files/x86/isolinux.cfg +index 216d36f..ac1978b 100644 +--- a/80-anolis/config_files/x86/isolinux.cfg ++++ b/80-anolis/config_files/x86/isolinux.cfg +@@ -61,13 +61,13 @@ menu separator # insert an empty line + label linux + menu label ^Install @PRODUCT@ @VERSION@ + kernel vmlinuz +- append initrd=initrd.img @ROOT@ quiet ++ append initrd=initrd.img @ROOT@ quiet @TIMEOUT@ + + label check + menu label Test this ^media & install @PRODUCT@ @VERSION@ + menu default + kernel vmlinuz +- append initrd=initrd.img @ROOT@ rd.live.check quiet ++ append initrd=initrd.img @ROOT@ rd.live.check quiet @TIMEOUT@ + + menu separator # insert an empty line + +@@ -83,7 +83,7 @@ label basic + @PRODUCT@ @VERSION@. + endtext + kernel vmlinuz +- append initrd=initrd.img @ROOT@ nomodeset quiet ++ append initrd=initrd.img @ROOT@ nomodeset quiet @TIMEOUT@ + + label rescue + menu indent count 5 +@@ -93,7 +93,7 @@ label rescue + and edit config files to try to get it booting again. + endtext + kernel vmlinuz +- append initrd=initrd.img @ROOT@ inst.rescue quiet ++ append initrd=initrd.img @ROOT@ inst.rescue quiet @TIMEOUT@ + + menu separator # insert an empty line + +diff --git a/80-anolis/efi.tmpl b/80-anolis/efi.tmpl +index 5e43ee6..3314a45 100644 +--- a/80-anolis/efi.tmpl ++++ b/80-anolis/efi.tmpl +@@ -50,6 +50,7 @@ ${make_efiboot("images/efiboot.img")} + replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} + replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} + replace @ISOLABEL@ '${isolabel}' ${eficonf} ++ + %if disk: + replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf} + %else: +diff --git a/80-anolis/s390.tmpl b/80-anolis/s390.tmpl +index 89d55f3..a7c3bfb 100644 +--- a/80-anolis/s390.tmpl ++++ b/80-anolis/s390.tmpl +@@ -34,6 +34,7 @@ install ${configdir}/generic.ins . + ## configure bootloader + replace @INITRD_LOAD_ADDRESS@ ${INITRD_ADDRESS} generic.ins + replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/cdboot.prm ++replace @TIMEOUT@ 'inst.xtimeout=1200' ${BOOTDIR}/cdboot.prm + + ## install kernel + installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/kernel.img +diff --git a/80-anolis/x86.tmpl b/80-anolis/x86.tmpl +index 68e7aa2..98cfa6d 100644 +--- a/80-anolis/x86.tmpl ++++ b/80-anolis/x86.tmpl +@@ -45,6 +45,8 @@ install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png + replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg + replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg + replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg ++replace @TIMEOUT@ 'inst.xtimeout=1200' ${BOOTDIR}/isolinux.cfg ++replace @TIMEOUT@ 'inst.xtimeout=1200' ${BOOTDIR}/grub.conf + + ## install kernels + mkdir ${KERNELDIR} +-- +2.33.0 diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index fecca86d3204a8e0077322d9ad720686167d1a3c..fb8d4540f8c6b3c0b5f3efb8d47818f9cf2876e5 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 21 +%define anolis_release 22 Name: lorax-templates-anolis Version: 37.0 @@ -30,7 +30,7 @@ Patch1015: 1015-add-boot.iso-for-loongarch64.patch Patch1016: 1016-remove-deprecated-kernel-packs-in-6.6-version.patch Patch1017: 1017-add-ls2k500sfb.ko-for-loongarch64.patch Patch1018: 1018-Set-data-source-for-EFI-System-Partition-on-loongarch64.patch - +Patch1019: 1019-add-inst.xtimeout-1200.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -55,6 +55,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Tue Oct 29 2024 yangxinyu - 37.0-1.22 +- add-inst.xtimeout-1200 + * Mon Jul 22 2024 Wenlong Zhang - 37.0-1.21 - Set data source for EFI System Partition on loongarch64