Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-05 07:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues with the netboot tarballs:

Browse Source 
* Fix some issues with the netboot tarballs:
  - Include the signed shim (oops).
  - Make the kernel path on disk and in the bootloader config match (more
    oops).
  - Make paths more architecture dependent as the code in grubnetXXX.efi to
    probe a platform dependent path first doesn't work.
This commit is contained in:
Michael Hudson-Doyle 2022-07-12 14:14:47 +12:00
parent 941cd3c64a
commit 13ed256581
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,9 +1,18 @@
livecd-rootfs (2.771) UNRELEASED; urgency=medium livecd-rootfs (2.771) UNRELEASED; urgency=medium
[ Steve Langasek ]
* Drop support for building i386 images aside from the launchpad builder * Drop support for building i386 images aside from the launchpad builder
images. images.
* Remove fwupd from the cloud images. LP: #1981109. * Remove fwupd from the cloud images. LP: #1981109.
[ Michael Hudson-Doyle ]
* Fix some issues with the netboot tarballs:
- Include the signed shim (oops).
- Make the kernel path on disk and in the bootloader config match (more
oops).
- Make paths more architecture dependent as the code in grubnetXXX.efi to
probe a platform dependent path first doesn't work.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 25 Jul 2022 12:49:28 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 25 Jul 2022 12:49:28 -0700
livecd-rootfs (2.770) kinetic; urgency=medium livecd-rootfs (2.770) kinetic; urgency=medium

52
live-build/ubuntu-server/hooks/05-netboot-tarball.binary
View File

@ -20,49 +20,49 @@ mkdir -p tarball/$ARCH
case $ARCH in case $ARCH in
s390x) s390x)
cp $INITRD tarball/$ARCH/initrd.ubuntu cp $INITRD tarball/$ARCH/initrd.ubuntu
cp $KERNEL tarball/$ARCH/kernel.ubuntu cp $KERNEL tarball/$ARCH/linux.ubuntu
;; ;;
*) *)
cp $INITRD tarball/$ARCH/initrd cp $INITRD tarball/$ARCH/initrd
cp $KERNEL tarball/$ARCH/kernel cp $KERNEL tarball/$ARCH/linux
;; ;;
esac esac
case $ARCH in case $ARCH in
amd64) amd64)
mv chroot/usr/lib/PXELINUX/pxelinux.0 tarball/pxelinux.0 mv chroot/usr/lib/PXELINUX/pxelinux.0 tarball/amd64/pxelinux.0
mv chroot/usr/lib/syslinux/modules/bios/ldlinux.c32 tarball/ldlinux.c32 mv chroot/usr/lib/syslinux/modules/bios/ldlinux.c32 tarball/amd64/ldlinux.c32
mv chroot/usr/lib/shim/shimx64.efi tarball/bootx64.efi mv chroot/usr/lib/shim/shimx64.efi.signed tarball/amd64/bootx64.efi
mv chroot/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed tarball/grubx64.efi mv chroot/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed tarball/amd64/grubx64.efi
mkdir tarball/x86_64-efi tarball/pxelinux.cfg mkdir tarball/amd64/grub tarball/amd64/pxelinux.cfg
cat > tarball/x86_64-efi/grub.cfg.in <<EOF cat > tarball/amd64/grub/grub.cfg.in <<EOF
menuentry "Install Ubuntu Server" { menuentry "Install Ubuntu Server" {
set gfxpayload=keep set gfxpayload=keep
linux amd64/linux iso-url=#ISOURL# ip=dhcp --- linux linux iso-url=#ISOURL# ip=dhcp ---
initrd amd64/initrd initrd initrd
} }
EOF EOF
cat > tarball/pxelinux.cfg/default.in <<EOF cat > tarball/amd64/pxelinux.cfg/default.in <<EOF
DEFAULT install DEFAULT install
LABEL install LABEL install
KERNEL amd64/linux KERNEL linux
INITRD amd64/initrd INITRD initrd
APPEND root=/dev/ram0 ramdisk_size=1500000 ip=dhcp iso-url=#ISOURL# --- APPEND root=/dev/ram0 ramdisk_size=1500000 ip=dhcp iso-url=#ISOURL# ---
EOF EOF
;; ;;
arm64) arm64)
mv chroot/usr/lib/shim/shimaa64.efi tarball/bootaa64.efi mv chroot/usr/lib/shim/shimaa64.efi.signed tarball/arm64/bootaa64.efi
mv chroot/usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed tarball/grubaa64.efi mv chroot/usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed tarball/arm64/grubaa64.efi
mkdir tarball/arm64-efi mkdir tarball/arm64/grub
cat > tarball/arm64-efi/grub.cfg.in <<EOF cat > tarball/arm64/grub/grub.cfg.in <<EOF
menuentry "Install Ubuntu Server" { menuentry "Install Ubuntu Server" {
set gfxpayload=keep set gfxpayload=keep
linux arm64/linux iso-url=#ISOURL# ip=dhcp --- linux linux iso-url=#ISOURL# ip=dhcp ---
initrd arm64/initrd initrd initrd
} }
EOF EOF
;; ;;
@ -83,7 +83,7 @@ EOF
EOF EOF
cat > tarball/s390x/ubuntu.ins <<EOF cat > tarball/s390x/ubuntu.ins <<EOF
* Ubuntu for IBM Z (default kernel) * Ubuntu for IBM Z (default kernel)
kernel.ubuntu 0x00000000 linux.ubuntu 0x00000000
initrd.off 0x0001040c initrd.off 0x0001040c
initrd.siz 0x00010414 initrd.siz 0x00010414
parmfile.ubuntu 0x00010480 parmfile.ubuntu 0x00010480
@ -94,20 +94,20 @@ iso-url=#ISOURL# ---
EOF EOF
perl -e "print pack('N', 0x1000000)" > tarball/s390x/initrd.off perl -e "print pack('N', 0x1000000)" > tarball/s390x/initrd.off
perl -e "print pack('N', -s 'tarball/s390x/initrd.ubuntu')" > tarball/s390x/initrd.siz perl -e "print pack('N', -s 'tarball/s390x/initrd.ubuntu')" > tarball/s390x/initrd.siz
cat > tarball/s390x-kvm.cfg.in <<EOF cat > tarball/s390x/kvm.cfg.in <<EOF
DEFAULT install DEFAULT install
LABEL install LABEL install
KERNEL amd64/linux.ubuntu KERNEL linux.ubuntu
INITRD amd64/initrd.ubuntu INITRD initrd.ubuntu
APPEND ip=dhcp iso-url=#ISOURL# --- APPEND ip=dhcp iso-url=#ISOURL# ---
EOF EOF
cat > tarball/dpm.cfg.in <<EOF cat > tarball/s390x/dpm.cfg.in <<EOF
PROMPT 1 PROMPT 1
DEFAULT install DEFAULT install
TIMEOUT 1 TIMEOUT 1
LABEL install LABEL install
kernel=amd64/linux.ubuntu kernel=linux.ubuntu
initrd=amd64/initrd.ubuntu initrd=initrd.ubuntu
append=ip=dhcp iso-url=#ISOURL# --- append=ip=dhcp iso-url=#ISOURL# ---
EOF EOF
;; ;;