Merge lp:~psusi/ubuntu/vivid/grub-installer/fix-efi-multi-disk-installs into lp:ubuntu/vivid/grub-installer

[Phillip Susi]

[lp:~psusi/ubuntu/vivid/grub-installer/fix-efi-multi-disk-installs]

121. By dann frazier on 2015-02-03

Install grub-arm64-efi on arm64/efi platforms. (From Debian)

[Mathieu Trudel-Lapierre (cyphermox)]

There's a comment further down that explicitly mentions avoiding touching the active flag on GPT, so in that sense your changes look fine, but it seems the code that actually did ignore GPT from grub-installer itself went away, and now that is only checked in ensure-active itself -- could you move that comment and reword it so that the intent of the change is clear?

Something like "doing this because we won't set partitions active on GPT, and if $bootdisk points to a drive with no partition table things will explode in fun ways"... In your own words ;)

review: Needs Fixing

[Phillip Susi (psusi)]

You just want me to change the comments? Ok, I'll resubmit.

review: Needs Resubmitting

[Mathieu Trudel-Lapierre (cyphermox)]

Hmm, but now we have an issue with changelog. Would you mind fixing this on top? No need to resubmit, just adjust the changelog to resolve conflicts there and I'll merge then.

review: Needs Fixing

[lp:~psusi/ubuntu/vivid/grub-installer/fix-efi-multi-disk-installs]

122. By Phillip Susi on 2015-02-17

Don't try to mark a partition as active, except on grub-pc.
This was causing failures for grub-efi (LP: #1303790).

[Phillip Susi (psusi)]

Ahh, someone else touched it since I originally submitted this.. changelog merged.

[Phillip Susi (psusi)]

Mathieu, can you merge this now?

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-03 16:45:04 +0000
+++ debian/changelog	2015-02-17 21:22:11 +0000
@@ -1,3 +1,10 @@
+grub-installer (1.78ubuntu25) vivid; urgency=medium
+
+  * Don't try to mark a partition as active, except on grub-pc.
+    This was causing failures for grub-efi (LP: #1303790).
+
+ -- Phillip Susi <[e-mail]>  Tue, 27 Jan 2015 15:51:09 -0500
+
 grub-installer (1.78ubuntu24) vivid; urgency=medium
 
   * Install grub-arm64-efi on arm64/efi platforms. (From Debian)

=== modified file 'grub-installer'
--- grub-installer	2015-02-03 16:45:04 +0000
+++ grub-installer	2015-02-17 21:22:11 +0000
@@ -1009,6 +1009,12 @@
 }
 
 make_active_partition () {
+	if [ "$grub_package" != "grub-pc" ]; then
+	# only do this for grub-pc since on EFI $bootdev is a dummy argument
+	# and looking for a partition table on the wrong or non existing disk
+	# crashes the installer LP:#1303790
+		return
+	fi
 	bootdisk=
 	bootpart=
 	case $bootdev in