From 364e561308a366ab7e3b2eac7e339bcd9e2afbbd Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Mon, 20 Jun 2022 21:53:29 +1200
Subject: [PATCH] Use the new iso-url= parameter in the bootloader configs in
 the netboot tarballs.

---
 debian/changelog                                     |  7 +++++++
 .../ubuntu-server/hooks/05-netboot-tarball.binary    | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2090f772..5597072c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.768) UNRELEASED; urgency=medium
+
+  * Use the new iso-url= parameter in the bootloader configs in the netboot
+    tarballs.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 20 Jun 2022 21:52:58 +1200
+
 livecd-rootfs (2.767) kinetic; urgency=medium
 
   * Do not modify /etc/ssh/sshd_config for ubuntu-cpc project
diff --git a/live-build/ubuntu-server/hooks/05-netboot-tarball.binary b/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
index 60cd2506..0e06fa50 100755
--- a/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
+++ b/live-build/ubuntu-server/hooks/05-netboot-tarball.binary
@@ -40,7 +40,7 @@ case $ARCH in
         cat > tarball/x86_64-efi/grub.cfg.in <<EOF
 menuentry "Install Ubuntu Server" {
         set gfxpayload=keep
-        linux   amd64/linux url=#ISOURL# ip=dhcp ---
+        linux   amd64/linux iso-url=#ISOURL# ip=dhcp ---
         initrd  amd64/initrd
 }
 EOF
@@ -49,7 +49,7 @@ DEFAULT install
 LABEL install
   KERNEL amd64/linux
   INITRD amd64/initrd
-  APPEND root=/dev/ram0 ramdisk_size=1500000 ip=dhcp url=#ISOURL# ---
+  APPEND root=/dev/ram0 ramdisk_size=1500000 ip=dhcp iso-url=#ISOURL# ---
 EOF
         ;;
 
@@ -61,7 +61,7 @@ EOF
         cat > tarball/arm64-efi/grub.cfg.in <<EOF
 menuentry "Install Ubuntu Server" {
         set gfxpayload=keep
-        linux   arm64/linux url=#ISOURL# ip=dhcp ---
+        linux   arm64/linux iso-url=#ISOURL# ip=dhcp ---
         initrd  arm64/initrd
 }
 EOF
@@ -90,7 +90,7 @@ parmfile.ubuntu 0x00010480
 initrd.ubuntu 0x01000000
 EOF
         cat > tarball/s390x/parmfile.ubuntu.in <<EOF
-url=#ISOURL# ---
+iso-url=#ISOURL# ---
 EOF
         perl -e "print pack('N', 0x1000000)" > tarball/s390x/initrd.off
         perl -e "print pack('N', -s 'tarball/s390x/initrd.ubuntu')" > tarball/s390x/initrd.siz
@@ -99,7 +99,7 @@ DEFAULT install
 LABEL install
   KERNEL amd64/linux.ubuntu
   INITRD amd64/initrd.ubuntu
-  APPEND ip=dhcp url=#ISOURL# ---
+  APPEND ip=dhcp iso-url=#ISOURL# ---
 EOF
         cat > tarball/dpm.cfg.in <<EOF
 PROMPT 1
@@ -108,7 +108,7 @@ TIMEOUT 1
 LABEL install
   kernel=amd64/linux.ubuntu
   initrd=amd64/initrd.ubuntu
-  append=ip=dhcp url=#ISOURL# ---
+  append=ip=dhcp iso-url=#ISOURL# ---
 EOF
         ;;
 esac