From ae7fc295320348b618884696a338ada41e005377 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Sat, 8 May 2021 19:36:19 -0400 Subject: [PATCH] upgrade pkg pxe-network-install to fix CentOS 8 main changes: 1. for image LiveOS/squashfs.img in CentOS 7 is changed to images/install.img so spec and build_srpm.data are updated. 2. for pkg 'dhcp-client' is upgraded to 4.3.6 which do not support option '-timeout' in CentOS 8, however, "rd.net.timeout.dhcp" of dracut in CentOS 8 still add '-timeout ' when dhclient is called. so removing "rd.net.timeout.dhcp" option in template files for pxelinux.conf Story: 2006729 Task: 37961 Signed-off-by: SidneyAn Signed-off-by: Charles Short Change-Id: Ia81b8bfd587b2570ca1d1d778a43b0e8391ac514 --- .../pxe-network-installer/centos/build_srpm.data | 2 +- .../centos/pxe-network-installer.spec | 12 +++++++----- .../centos-pxe-controller-install | 2 +- .../centos-pxe-smallsystem-install | 2 +- .../centos-pxe-smallsystem_lowlatency-install | 2 +- .../pxe-network-installer/centos-pxe-storage-install | 2 +- .../pxe-network-installer/centos-pxe-worker-install | 2 +- .../centos-pxe-worker_lowlatency-install | 2 +- .../efi-centos-pxe-controller-install | 2 +- .../efi-centos-pxe-smallsystem-install | 2 +- .../efi-centos-pxe-smallsystem_lowlatency-install | 2 +- .../efi-centos-pxe-storage-install | 2 +- .../efi-centos-pxe-worker-install | 2 +- .../efi-centos-pxe-worker_lowlatency-install | 2 +- 14 files changed, 20 insertions(+), 18 deletions(-) diff --git a/installer/pxe-network-installer/centos/build_srpm.data b/installer/pxe-network-installer/centos/build_srpm.data index 7be54e52..07d39d08 100644 --- a/installer/pxe-network-installer/centos/build_srpm.data +++ b/installer/pxe-network-installer/centos/build_srpm.data @@ -2,7 +2,7 @@ COPY_LIST="pxe-network-installer/* \ $GIT_BASE/bsp-files/grub.cfg \ $DISTRO_REPO_BASE/Binary/images/efiboot.img \ /import/mirrors/CentOS/stx-installer/initrd.img \ - /import/mirrors/CentOS/stx-installer/squashfs.img \ + /import/mirrors/CentOS/stx-installer/install.img \ /import/mirrors/CentOS/stx-installer/vmlinuz \ " diff --git a/installer/pxe-network-installer/centos/pxe-network-installer.spec b/installer/pxe-network-installer/centos/pxe-network-installer.spec index bd767a0d..478b8159 100644 --- a/installer/pxe-network-installer/centos/pxe-network-installer.spec +++ b/installer/pxe-network-installer/centos/pxe-network-installer.spec @@ -11,7 +11,7 @@ Source0: LICENSE Source001: vmlinuz Source002: initrd.img -Source003: squashfs.img +Source003: install.img Source010: pxeboot-update.sh Source011: grub.cfg @@ -64,8 +64,8 @@ install -v -m 644 %{_sourcedir}/initrd.img \ ln -s installer-bzImage_1.0 %{buildroot}/pxeboot/rel-%{platform_release}/installer-bzImage ln -s installer-intel-x86-64-initrd_1.0 %{buildroot}/pxeboot/rel-%{platform_release}/installer-initrd -install -v -D -m 644 %{_sourcedir}/squashfs.img \ - %{buildroot}/www/pages/feed/rel-%{platform_release}/LiveOS/squashfs.img +install -v -D -m 644 %{_sourcedir}/install.img \ + %{buildroot}/www/pages/feed/rel-%{platform_release}/images/install.img install -v -d -m 755 %{buildroot}%{_sbindir} @@ -122,7 +122,9 @@ install -v -m 0644 \ %{_datadir}/syslinux/chain.c32 \ %{_datadir}/syslinux/linux.c32 \ %{_datadir}/syslinux/reboot.c32 \ - %{_datadir}/syslinux/pxechn.c32 \ + %{_datadir}/syslinux/ldlinux.c32 \ + %{_datadir}/syslinux/libcom32.c32 \ + %{_datadir}/syslinux/libutil.c32 \ %{_datadir}/syslinux/pxelinux.0 \ %{buildroot}/pxeboot @@ -139,5 +141,5 @@ ln -s pxelinux.cfg/grub.cfg %{buildroot}/pxeboot/grub.cfg %dir /pxeboot /pxeboot/* %{_sbindir}/pxeboot-update-%{platform_release}.sh -/www/pages/feed/rel-%{platform_release}/LiveOS/squashfs.img +/www/pages/feed/rel-%{platform_release}/images/install.img diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install index c2d21b6e..75465fdc 100644 --- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install +++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install @@ -22,6 +22,6 @@ LABEL 1 MENU LABEL ^1) Standard Controller MENU DEFAULT KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx + APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install index 3931ab1a..451d1632 100644 --- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install +++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install @@ -22,6 +22,6 @@ LABEL 1 MENU LABEL ^1) All-in-one MENU DEFAULT KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx + APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install index 12f5fb14..13f7a7cf 100644 --- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install @@ -22,6 +22,6 @@ LABEL 1 MENU LABEL ^1) All-in-one (lowlatency) MENU DEFAULT KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx + APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install index bb9f7b17..9581e64b 100644 --- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install +++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install @@ -22,6 +22,6 @@ LABEL 1 MENU LABEL ^1) Storage MENU DEFAULT KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx + APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install index 8b7cf41c..88f5626a 100644 --- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install +++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install @@ -22,6 +22,6 @@ LABEL 1 MENU LABEL ^1) Worker MENU DEFAULT KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx + APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install index c224ead0..1a6be97e 100644 --- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install @@ -22,6 +22,6 @@ LABEL 1 MENU LABEL ^1) Lowlatency Worker MENU DEFAULT KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx + APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install index 1c68ec6c..610a4876 100755 --- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install @@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' menuentry '1) UEFI Standard Controller' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx + linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx initrdefi rel-xxxSW_VERSIONxxx/installer-initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install index a42fabc9..1b522a0f 100755 --- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install @@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' menuentry '1) UEFI All-in-one' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx + linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx initrdefi rel-xxxSW_VERSIONxxx/installer-initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install index c713cb12..fa5e478c 100755 --- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install @@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' menuentry '1) UEFI All-in-one (lowlatency)' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx + linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx initrdefi rel-xxxSW_VERSIONxxx/installer-initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install index e0afdcd8..719439af 100755 --- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install @@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' menuentry '1) UEFI Storage' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx + linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx initrdefi rel-xxxSW_VERSIONxxx/installer-initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install index 3304299a..9b267677 100755 --- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install @@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' menuentry '1) UEFI Worker' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx + linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx initrdefi rel-xxxSW_VERSIONxxx/installer-initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install index 2430abb0..852b896e 100755 --- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install @@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' menuentry '1) UEFI Lowlatency Worker' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx + linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx initrdefi rel-xxxSW_VERSIONxxx/installer-initrd }