Merge lp:~vorlon/goget-ubuntu-touch/uefi into lp:goget-ubuntu-touch

[Steve Langasek]

UEFI support for ubuntu-device-flash.

This is a preliminary MP for adding UEFI support to ubuntu-device-flash.
It's not ready for merging, because the handling needs to be conditional by
architecture.

[Sergio Schvezov (sergiusens)]

make func NewCoreGrubImage(location string, size int64) *CoreGrubImage {

look like the u-boot one

func NewCoreUBootImage(location string, size int64, hw HardwareDescription, oem OemDescription) *CoreUBootImage {

and keep the oem (and hw) entries as members of the struct, then,

oem.Architecture() returns the arch

[Steve Langasek (vorlon)]

Now uses oem.Architecture() support from trunk, so I think this is ready for review.

Before merging we should verify whether writing of grub_env works from EFI, without which the a/b failover support won't work correctly.

[Steve Langasek (vorlon)]

I've just done a quick test setting a grub_env variable under EFI GRUB, and it appears to work fine.

[Sergio Schvezov (sergiusens)]

This looks good, but can you apply this please?

$ gofmt -d diskimage/core_grub.go
diff diskimage/core_grub.go gofmt/diskimage/core_grub.go
--- /tmp/gofmt586008706 2015-04-27 08:53:38.737751816 +0200
+++ /tmp/gofmt636166137 2015-04-27 08:53:38.737751816 +0200
@@ -342,7 +342,7 @@
   return fmt.Errorf("unsupported architecture for GRUB on EFI: %s", arch)
  }

- if (arch == "amd64" || arch == "i386") {
+ if arch == "amd64" || arch == "i386" {
   // install grub BIOS support
   if out, err := exec.Command("chroot", img.System(), "grub-install", "/root_dev").CombinedOutput(); err != nil {
    return fmt.Errorf("unable to install grub (BIOS): %s", out)
@@ -350,7 +350,7 @@
  }

  // install grub EFI
- if out, err := exec.Command("chroot", img.System(), "grub-install", fmt.Sprint("--target=" + grubTarget), "--no-nvram", "--removable", "--efi-directory=/boot/efi").CombinedOutput(); err != nil {
+ if out, err := exec.Command("chroot", img.System(), "grub-install", fmt.Sprint("--target="+grubTarget), "--no-nvram", "--removable", "--efi-directory=/boot/efi").CombinedOutput(); err != nil {
   return fmt.Errorf("unable to install grub (EFI): %s", out)
  }
  // tell our EFI grub where to find its full config
@@ -364,7 +364,6 @@
   return err
  }

-
  // ensure we run not into recordfail issue
  grubDir := filepath.Join(img.System(), "etc", "default", "grub.d")
  if err := os.MkdirAll(grubDir, 0755); err != nil {

[lp:~vorlon/goget-ubuntu-touch/uefi]

168. By Steve Langasek on 2015-04-27

formatting/style changes per Sergio

[Sergio Schvezov (sergiusens)]

Thanks for this branch!

review: Approve

=== modified file 'diskimage/core_grub.go'
--- diskimage/core_grub.go	2015-04-16 23:06:44 +0000
+++ diskimage/core_grub.go	2015-04-27 07:03:04 +0000
@@ -1,7 +1,7 @@
 //
 // diskimage - handles ubuntu disk images
 //
-// Copyright (c) 2013 Canonical Ltd.
+// Copyright (c) 2013-2015 Canonical Ltd.
 //
 // Written by Sergio Schvezov <[e-mail]>
 //
@@ -35,16 +35,20 @@
 
 type CoreGrubImage struct {
 	CoreImage
+	hardware  HardwareDescription
+	oem       OemDescription
 	location  string
 	size      int64
 	baseMount string
 	parts     []partition
 }
 
-func NewCoreGrubImage(location string, size int64) *CoreGrubImage {
+func NewCoreGrubImage(location string, size int64, hw HardwareDescription, oem OemDescription) *CoreGrubImage {
 	return &CoreGrubImage{
 		location: location,
 		size:     size,
+		hardware: hw,
+		oem:      oem,
 	}
 }
 
@@ -55,6 +59,10 @@
 GRUB_RECORDFAIL_TIMEOUT=0
 `
 
+const grubStubContent = `set prefix=($root)'/EFI/ubuntu/grub'
+configfile $prefix/grub.cfg
+`
+
 func (img *CoreGrubImage) Mount() error {
 	baseMount, err := mount(img.parts)
 	if err != nil {
@@ -319,9 +327,41 @@
 	}
 	defer unmount(bootGrubDir)
 
-	// install grub
-	if out, err := exec.Command("chroot", img.System(), "grub-install", "/root_dev").CombinedOutput(); err != nil {
-		return fmt.Errorf("unable to install grub: %s", out)
+	var grubTarget string
+
+	arch := img.oem.Architecture()
+
+	switch arch {
+	case "armhf":
+		grubTarget = "arm-efi"
+	case "amd64":
+		grubTarget = "x86_64-efi"
+	case "i386":
+		grubTarget = "i386-efi"
+	default:
+		return fmt.Errorf("unsupported architecture for GRUB on EFI: %s", arch)
+	}
+
+	if arch == "amd64" || arch == "i386" {
+		// install grub BIOS support
+		if out, err := exec.Command("chroot", img.System(), "grub-install", "/root_dev").CombinedOutput(); err != nil {
+			return fmt.Errorf("unable to install grub (BIOS): %s", out)
+		}
+	}
+
+	// install grub EFI
+	if out, err := exec.Command("chroot", img.System(), "grub-install", fmt.Sprint("--target="+grubTarget), "--no-nvram", "--removable", "--efi-directory=/boot/efi").CombinedOutput(); err != nil {
+		return fmt.Errorf("unable to install grub (EFI): %s", out)
+	}
+	// tell our EFI grub where to find its full config
+	efiBootDir := filepath.Join(img.System(), "boot", "efi", "EFI", "BOOT")
+	grubStub, err := os.Create(filepath.Join(efiBootDir, "grub.cfg"))
+	if err != nil {
+		return fmt.Errorf("unable to create %s file: %s", grubStub.Name(), err)
+	}
+	defer grubStub.Close()
+	if _, err := io.WriteString(grubStub, grubStubContent); err != nil {
+		return err
 	}
 
 	// ensure we run not into recordfail issue

=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2015-04-23 03:40:37 +0000
+++ ubuntu-device-flash/core.go	2015-04-27 07:03:04 +0000
@@ -235,12 +235,12 @@
 	loader := coreCmd.oem.OEM.Hardware.Bootloader
 	switch loader {
 	case "grub":
-		img = diskimage.NewCoreGrubImage(coreCmd.Output, coreCmd.Size)
+		img = diskimage.NewCoreGrubImage(coreCmd.Output, coreCmd.Size, coreCmd.hardware, coreCmd.oem)
 	case "u-boot":
 		img = diskimage.NewCoreUBootImage(coreCmd.Output, coreCmd.Size, coreCmd.hardware, coreCmd.oem)
 	default:
 		fmt.Printf("Bootloader set to '%s' in oem hardware description, assuming grub as a fallback\n", loader)
-		img = diskimage.NewCoreGrubImage(coreCmd.Output, coreCmd.Size)
+		img = diskimage.NewCoreGrubImage(coreCmd.Output, coreCmd.Size, coreCmd.hardware, coreCmd.oem)
 	}
 
 	printOut("Partitioning...")