Merge lp:~sergiusens/goget-ubuntu-touch/legacy-grub-- into lp:goget-ubuntu-touch

[Sergio Schvezov]

Remove legacy grub handling (running of update-grub)

[Ricardo Mendoza (ricmm)]

LGTM

review: Approve

=== modified file 'diskimage/core_grub.go'
--- diskimage/core_grub.go	2015-06-23 13:09:28 +0000
+++ diskimage/core_grub.go	2015-09-15 16:14:18 +0000
@@ -14,7 +14,6 @@
 	"os"
 	"os/exec"
 	"path/filepath"
-	"time"
 
 	"launchpad.net/goget-ubuntu-touch/sysutils"
 )
@@ -33,11 +32,9 @@
 
 type CoreGrubImage struct {
 	BaseImage
-
-	legacyGrub bool
 }
 
-func NewCoreGrubImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription, updateGrub bool) *CoreGrubImage {
+func NewCoreGrubImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription) *CoreGrubImage {
 	return &CoreGrubImage{
 		BaseImage: BaseImage{
 			location:  location,
@@ -47,7 +44,6 @@
 			oem:       oem,
 			partCount: 5,
 		},
-		legacyGrub: updateGrub,
 	}
 }
 
@@ -88,12 +84,10 @@
 }
 
 func (img *CoreGrubImage) SetupBoot() error {
-	if !img.legacyGrub {
-		// destinations
-		bootPath := filepath.Join(img.baseMount, string(bootDir), "EFI", "ubuntu", "grub")
-		if err := img.GenericBootSetup(bootPath); err != nil {
-			return err
-		}
+	// destinations
+	bootPath := filepath.Join(img.baseMount, string(bootDir), "EFI", "ubuntu", "grub")
+	if err := img.GenericBootSetup(bootPath); err != nil {
+		return err
 	}
 
 	return img.setupGrub()
@@ -193,37 +187,6 @@
 		return err
 	}
 
-	if img.legacyGrub {
-		if err := img.updateGrub(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (img *CoreGrubImage) updateGrub() error {
-	// ensure we run not into recordfail issue
-	grubDir := filepath.Join(img.System(), "etc", "default", "grub.d")
-	if err := os.MkdirAll(grubDir, 0755); err != nil {
-		return fmt.Errorf("unable to create %s dir: %s", grubDir, err)
-	}
-	grubFile, err := os.Create(filepath.Join(grubDir, "50-system-image.cfg"))
-	if err != nil {
-		return fmt.Errorf("unable to create %s file: %s", grubFile.Name(), err)
-	}
-	defer grubFile.Close()
-	if _, err := io.WriteString(grubFile, grubCfgContent); err != nil {
-		return err
-	}
-
-	// I don't know why this is needed, I just picked it up from the original implementation
-	time.Sleep(3 * time.Second)
-
-	if out, err := exec.Command("chroot", img.System(), "update-grub").CombinedOutput(); err != nil {
-		return fmt.Errorf("unable to update grub: %s", out)
-	}
-
 	return nil
 }
 

=== modified file 'ubuntu-device-flash/snappy.go'
--- ubuntu-device-flash/snappy.go	2015-09-08 14:59:54 +0000
+++ ubuntu-device-flash/snappy.go	2015-09-15 16:14:18 +0000
@@ -517,8 +517,7 @@
 	loader := s.oem.OEM.Hardware.Bootloader
 	switch loader {
 	case "grub":
-		legacyGrub := s.Positional.Release == "15.04"
-		s.img = diskimage.NewCoreGrubImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem, legacyGrub)
+		s.img = diskimage.NewCoreGrubImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem)
 	case "u-boot":
 		s.img = diskimage.NewCoreUBootImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem)
 	default: