Merge "upgrade pkg pxe-network-install to fix CentOS 8" into f/centos8
This commit is contained in:
commit
c63d94ec95
@ -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 \
|
||||
"
|
||||
|
||||
|
@ -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}
|
||||
|
||||
@ -123,7 +123,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
|
||||
|
||||
@ -140,5 +142,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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user