Merge ~rafaeldtinoco/ubuntu/+source/ipxe:ipxe-focal-merge into ubuntu/+source/ipxe:ubuntu/focal-devel

[Rafael David Tinoco]

This merge is using commits from previous merge at:

https://code.launchpad.net/~alkisg/ubuntu/+source/ipxe/+git/ipxe/+merge/376817

And is solving issues from:

https://bugs.launchpad.net/ubuntu/+source/ipxe/+bug/1811496

and

https://bugs.launchpad.net/ubuntu/+source/ipxe/+bug/1858374

A PPA containing the binary package can be found at:

https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1858374

[Christian Ehrhardt  (paelzer)]

Thanks for picking those up and combining those

[Christian Ehrhardt  (paelzer)]

The code of Alkis LGTM but it is complex, therefore I asked you to test it a while a go and that all looked good.
Therefore +1 to that part.

The ipxe id is a small, but helpful change for our users.
I double checked https://www.gnu.org/software/grub/manual/grub/grub.html#menuentry for side effects but I think it is useful and has no drawback.

ack to both parts of this.

[Christian Ehrhardt  (paelzer)]

Changelog LGTM, attribution is ok as well

I found a very minor symbol change to do int he changelog - see inline below

[Christian Ehrhardt  (paelzer)]

I also like that this is all encapsulated into /etc/grub.d/20_ipxe which makes it in the worst case of an issue for most setups easy to work around by removing that file

[Christian Ehrhardt  (paelzer)]

Overall +1, please try to use your new tagging and sponsoring powers :-)

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

$ git push pkg upload/1.0.0+git-20190109.133f4c4-0ubuntu3
Enumerating objects: 37, done.
Counting objects: 100% (37/37), done.
Delta compression using up to 8 threads
Compressing objects: 100% (17/17), done.
Writing objects: 100% (29/29), 2.65 KiB | 543.00 KiB/s, done.
Total 29 (delta 12), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ipxe
 * [new tag] upload/1.0.0+git-20190109.133f4c4-0ubuntu3 -> upload/1.0.0+git-20190109.133f4c4-0ubuntu3

[Rafael David Tinoco (rafaeldtinoco)]

$ dput ubuntu ./ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3_source.changes
Checking signature on .changes
gpg: ./ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ./ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3.dsc: done.
  Uploading ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3.debian.tar.xz: done.
  Uploading ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3_source.buildinfo: done.
  Uploading ipxe_1.0.0+git-20190109.133f4c4-0ubuntu3_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

https://launchpad.net/ubuntu/+source/ipxe/1.0.0+git-20190109.133f4c4-0ubuntu3 started building, consider that one merged and lets track migration the next few hours/days

diff --git a/debian/changelog b/debian/changelog
index c11bbfa..5744f44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ipxe (1.0.0+git-20190109.133f4c4-0ubuntu3) focal; urgency=medium
+
+  [Alkis Georgopoulos]
+  * d/tree/ipxe/etc/grub.d/20_ipxe: Make grub-ipxe work under UEFI
+    (LP: #1811496)
+    - Use ipxe.efi under UEFI
+    - Save default entry when iPXE is selected
+  [Sharon Dagan]
+  - d/tree/ipxe/etc/grub.d/20_ipxe: Identify ipxe grub menu entry in
+    an easier way (LP: #1858374)
+
+ -- Rafael David Tinoco <[e-mail]>  Mon, 06 Jan 2020 18:59:25 +0000
+
 ipxe (1.0.0+git-20190109.133f4c4-0ubuntu2) disco; urgency=medium
 
   * Add e1000e firmware for qemu. (closes: #884240)
diff --git a/debian/tree/ipxe/etc/grub.d/20_ipxe b/debian/tree/ipxe/etc/grub.d/20_ipxe
index 8be37c8..fc77dfd 100755
--- a/debian/tree/ipxe/etc/grub.d/20_ipxe
+++ b/debian/tree/ipxe/etc/grub.d/20_ipxe
@@ -15,11 +15,24 @@ IPXE=/boot/ipxe.lkrn
 
 if test -e "$IPXE" ; then
   IPXEPATH=$( make_system_path_relative_to_its_root "$IPXE" )
+  # Remove the .lkrn extension
+  IPXEPATH=${IPXEPATH%.lkrn}
   echo "Found iPXE image: $IPXE" >&2
   cat << EOF
-menuentry "Network boot (iPXE)" --users "" --class network {
+menuentry "Network boot (iPXE)" --users "" --class network --id ipxe {
 ${prepare_boot_cache}
-	linux16 $IPXEPATH
+EOF
+  save_default_entry | grub_add_tab
+  cat << EOF
+	if [ "\$grub_platform" = "efi" ]; then
+		chainloader $IPXEPATH.efi
+	else
+		linux16 $IPXEPATH.lkrn
+		# If the user provided an iPXE script, load it
+		if [ -f $IPXEPATH.ipxe ]; then
+			initrd16 $IPXEPATH.ipxe
+		fi
+	fi
 }
 EOF
 fi