starlingx/metal
Code Issues Proposed changes

Debian: Package instead of fetch pxeboot utilities

Browse Source 
This update packages the pxeboot utilities into the
pxe-network-installer and modifies the kickstart to
no longer fetch them.

Once packaged they no longer need to be staged in feed.
Once packaged then they can be patched.

Test Plan:

PASS: Build and install AIO DX
PASS: Compare /var/pxeboot dir before and after update
PASS: Verify system host-reinstall controller-0 from controller-1
PASS: Verify unlock of reinstalled controller-0
PASS: Verify kickstart logs now exclude pxeboot utility staging

Story: 2009968
Task: 46619
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
Change-Id: I75bcfe06724cbfc7203b187cb7c131694de69920
This commit is contained in:
Eric MacDonald 2022-10-23 11:07:47 +00:00
parent b88d7456b1
commit 492dfeec48
11 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
installer/pxe-network-installer/debian/deb_folder/rules
View File

@ -28,7 +28,7 @@ override_dh_install:
install -p -D -m 644 pxeboot.cfg.debian $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxeboot.cfg.debian
install -p -D -m 644 efi-pxeboot.cfg.debian $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxeboot.cfg.debian
install -p -D -m 755 pxeboot_setup.sh $(ROOT)/usr/sbin/pxeboot_setup.sh
install -p -D -m 755 pxeboot-update.sh %{ROOT}/usr/sbin/pxeboot-update-%{platform_release}.sh
install -p -D -m 755 pxeboot-update.sh ${ROOT}/usr/sbin/pxeboot-update-${platform_release}.sh
# Legacy BIOS System Node Install grub menus
install -p -D -m 700 debian-pxe-controller-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-controller-install-${platform_release}
@ -45,4 +45,15 @@ override_dh_install:
install -p -D -m 700 efi-debian-pxe-worker-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-worker-install-${platform_release}
install -p -D -m 700 efi-debian-pxe-worker_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-${platform_release}
install -p -D -m 700 efi-debian-pxe-smallsystem_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-${platform_release}
# Package pxeboot utilities in /var/pxeboot
install -d -m 755 $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/grubx64.efi $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/menu.c32 $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/ldlinux.c32 $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/libcom32.c32 $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/libutil.c32 $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/pxelinux.0 $(ROOT)/var/pxeboot
install -p -D -m 700 pxeboot/vesamenu.c32 $(ROOT)/var/pxeboot
dh_install

BIN
installer/pxe-network-installer/pxe-network-installer/pxeboot/grubx64.efi Normal file
View File

Binary file not shown.

BIN
installer/pxe-network-installer/pxe-network-installer/pxeboot/ldlinux.c32 Normal file
View File

Binary file not shown.

BIN
installer/pxe-network-installer/pxe-network-installer/pxeboot/libcom32.c32 Normal file
View File

Binary file not shown.

BIN
installer/pxe-network-installer/pxe-network-installer/pxeboot/libutil.c32 Normal file
View File

Binary file not shown.

0
kickstart/files/menu.c32 → installer/pxe-network-installer/pxe-network-installer/pxeboot/menu.c32
View File

BIN
installer/pxe-network-installer/pxe-network-installer/pxeboot/pxelinux.0 Normal file
View File

Binary file not shown.

BIN
installer/pxe-network-installer/pxe-network-installer/pxeboot/vesamenu.c32 Normal file
View File

Binary file not shown.

1
kickstart/debian/deb_folder/platform-kickstarts.install
View File

@ -1,2 +1 @@
var/www/pages/feed/*
var/pxeboot/menu.c32

2
kickstart/debian/deb_folder/rules
View File

@ -15,7 +15,5 @@ override_dh_auto_configure:
override_dh_install:
install -d -m 755 $(ROOT)/var/www/pages/feed/rel-${platform_release}
install -p -D -m 700 kickstart.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}
install -d -m 755 $(ROOT)/var/pxeboot
install -p -D -m 700 menu.c32 $(ROOT)/var/pxeboot
install -p -D -m 700 miniboot.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}
dh_install

23
kickstart/files/kickstart.cfg
View File

@ -2800,11 +2800,6 @@ if [ "${controller}" = true ] ; then
cp -a bzImage* ${pxeboot}/rel-${sw_release}
cp -a initrd* ${pxeboot}/rel-${sw_release}
ilog "Copy pxeboot utilities from /instboot/pxeboot to ${pxeboot}"
for f in pxelinux.0 libcom32.c32 ldlinux.c32 libutil.c32 vesamenu.c32 grubx64.efi; do
cp -a /instboot/pxeboot/${f} .
cp -a /instboot/pxeboot/${f} ${pxeboot}
done
cp -a /instboot/efi.img ${pxeboot}
cp -a /instboot/pxeboot/EFI ${pxeboot}
cp -a /instboot/pxeboot/EFI ${feed}/pxeboot
@ -2831,24 +2826,6 @@ if [ "${controller}" = true ] ; then
done
popd > /dev/null
ilog "Fetch pxeboot utilities from ${pxeurl}/pxeboot to ${pxeboot}"
pushd ${feed}/pxeboot > /dev/null
for f in pxelinux.0 libcom32.c32 ldlinux.c32 libutil.c32 vesamenu.c32 grubx64.efi; do
if [ ! -e "./${f}" ] ; then
ilog "... fetching ${f} to ${feed}/pxeboot"
wget ${NOVERIFYSSL_WGET_OPT} ${pxeurl}/pxeboot/${f} -o /${LAT_DIR}/wget.tmp
[ $? -ne 0 ] && report_failure_with_msg "Failed to get ${pxeurl}/pxeboot/${f}"
cat /${LAT_DIR}/wget.tmp >> /${LAT_DIR}/wget_pxeboot_setup.log
fi
# also copy it to the /var/pxeboot directory
if [ -e "./${f}" -a ! -e "${pxeboot}/${f}" ] ; then
ilog "... copying ${f} to ${pxeboot}"
cp ${f} ${pxeboot}
fi
done
popd > /dev/null
ilog "Fetch efi.img from ${pxeurl} to ${feed}"
pushd ${feed} > /dev/null
for f in efi.img ; do