Merge lp:~sergiusens/goget-ubuntu-touch/personalCmd into lp:goget-ubuntu-touch

[Sergio Schvezov]

Allow creating snappy personal images

I increased the min size for personal as my original thought of / fitting 2048 was not correct. I set it to 4096, the personal folk can iterate from here

[lp:~sergiusens/goget-ubuntu-touch/personalCmd]

197. By Sergio Schvezov on 2015-06-17

Update help for personal's size to 10

198. By Sergio Schvezov on 2015-06-17

Merged sizeMatters into personalCmd.

199. By Sergio Schvezov on 2015-06-17

Merged sizeMatters into personalCmd.

200. By Sergio Schvezov on 2015-06-18

Merged sizeMatters into personalCmd.

[John Lenton (chipaca)]

review: Approve

=== modified file 'diskimage/common.go'
--- diskimage/common.go	2015-06-18 20:45:47 +0000
+++ diskimage/common.go	2015-06-18 20:45:47 +0000
@@ -171,6 +171,7 @@
 	parts     []partition
 	partCount int
 	size      int64
+	rootSize  int
 }
 
 // Mount mounts the image. This also maps the loop device.

=== modified file 'diskimage/core_grub.go'
--- diskimage/core_grub.go	2015-06-18 20:45:47 +0000
+++ diskimage/core_grub.go	2015-06-18 20:45:47 +0000
@@ -35,11 +35,12 @@
 	BaseImage
 }
 
-func NewCoreGrubImage(location string, size int64, hw HardwareDescription, oem OemDescription) *CoreGrubImage {
+func NewCoreGrubImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription) *CoreGrubImage {
 	return &CoreGrubImage{
 		BaseImage{
 			location:  location,
 			size:      size,
+			rootSize:  rootSize,
 			hardware:  hw,
 			oem:       oem,
 			partCount: 5,
@@ -71,8 +72,8 @@
 
 	parted.addPart(grubLabel, "", fsNone, 4)
 	parted.addPart(bootLabel, bootDir, fsFat32, 64)
-	parted.addPart(systemALabel, systemADir, fsExt4, 1024)
-	parted.addPart(systemBLabel, systemBDir, fsExt4, 1024)
+	parted.addPart(systemALabel, systemADir, fsExt4, img.rootSize)
+	parted.addPart(systemBLabel, systemBDir, fsExt4, img.rootSize)
 	parted.addPart(writableLabel, writableDir, fsExt4, -1)
 
 	parted.setBoot(2)

=== modified file 'diskimage/core_uboot.go'
--- diskimage/core_uboot.go	2015-06-18 20:45:47 +0000
+++ diskimage/core_uboot.go	2015-06-18 20:45:47 +0000
@@ -66,13 +66,14 @@
 	Bootloader []string `yaml:"bootloader"`
 }
 
-func NewCoreUBootImage(location string, size int64, hw HardwareDescription, oem OemDescription) *CoreUBootImage {
+func NewCoreUBootImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription) *CoreUBootImage {
 	return &CoreUBootImage{
 		BaseImage{
 			hardware:  hw,
 			oem:       oem,
 			location:  location,
 			size:      size,
+			rootSize:  rootSize,
 			partCount: 4,
 		},
 	}

=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2015-06-18 20:45:47 +0000
+++ ubuntu-device-flash/core.go	2015-06-18 20:45:47 +0000
@@ -39,7 +39,8 @@
 }
 
 type CoreCmd struct {
-	EnableSsh bool `long:"enable-ssh" description:"Enable ssh on the image through cloud-init(not needed with developer mode)"`
+	EnableSsh bool  `long:"enable-ssh" description:"Enable ssh on the image through cloud-init(not needed with developer mode)"`
+	Size      int64 `long:"size" short:"s" description:"Size of image file to create in GB (min 4)" default:"4"`
 
 	Deprecated struct {
 		Cloud  bool   `long:"cloud" description:"Generate a pure cloud image without setting up cloud-init"`
@@ -63,6 +64,7 @@
 
 func (coreCmd *CoreCmd) Execute(args []string) error {
 	coreCmd.flavor = flavorCore
+	coreCmd.size = coreCmd.Size
 
 	if coreCmd.EnableSsh && coreCmd.Deprecated.Cloud {
 		return errors.New("--cloud and --enable-ssh cannot be used together")

=== added file 'ubuntu-device-flash/personal.go'
--- ubuntu-device-flash/personal.go	1970-01-01 00:00:00 +0000
+++ ubuntu-device-flash/personal.go	2015-06-18 20:45:47 +0000
@@ -0,0 +1,43 @@
+//
+// ubuntu-device-flash - Tool to download and flash devices with an Ubuntu Image
+//                       based system
+//
+// Copyright (c) 2013 Canonical Ltd.
+//
+// Written by Sergio Schvezov <[e-mail]>
+//
+package main
+
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 3, as published
+// by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranties of
+// MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+// PURPOSE.  See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+func init() {
+	parser.AddCommand("personal",
+		"Creates ubuntu personal images",
+		"",
+		&personalCmd)
+}
+
+type PersonalCmd struct {
+	Size int64 `long:"size" short:"s" description:"Size of image file to create in GB (min 10)" default:"10"`
+
+	Snapper
+}
+
+var personalCmd PersonalCmd
+
+func (personalCmd *PersonalCmd) Execute(args []string) error {
+	personalCmd.flavor = flavorPersonal
+	personalCmd.size = personalCmd.Size
+
+	return personalCmd.create()
+}

=== modified file 'ubuntu-device-flash/snappy.go'
--- ubuntu-device-flash/snappy.go	2015-06-18 20:45:47 +0000
+++ ubuntu-device-flash/snappy.go	2015-06-18 20:45:47 +0000
@@ -34,11 +34,16 @@
 type imageFlavor string
 
 const (
-	minSizePersonal = 8
+	minSizePersonal = 10
 	minSizeCore     = 4
 )
 
 const (
+	rootSizePersonal = 4096
+	rootSizeCore     = 1024
+)
+
+const (
 	flavorPersonal imageFlavor = "personal"
 	flavorCore     imageFlavor = "core"
 )
@@ -58,10 +63,20 @@
 	}
 }
 
+func (f imageFlavor) rootSize() int {
+	switch f {
+	case flavorPersonal:
+		return rootSizePersonal
+	case flavorCore:
+		return rootSizeCore
+	default:
+		panic("invalid flavor")
+	}
+}
+
 type Snapper struct {
 	Channel string `long:"channel" description:"Specify the channel to use" default:"stable"`
 	Output  string `long:"output" short:"o" description:"Name of the image file to create" required:"true"`
-	Size    int64  `long:"size" short:"s" description:"Size of image file to create in GB (min 4)" default:"4"`
 	Oem     string `long:"oem" description:"The snappy oem package to base the image out of" default:"generic-amd64"`
 
 	Development struct {
@@ -79,6 +94,8 @@
 	oem             diskimage.OemDescription
 	stagingRootPath string
 
+	size int64
+
 	flavor imageFlavor
 	device string
 
@@ -91,7 +108,7 @@
 		return fmt.Errorf("Giving up, the desired target output file %#v already exists", s.Output)
 	}
 
-	if s.Size < s.flavor.minSize() {
+	if s.size < s.flavor.minSize() {
 		return fmt.Errorf("minimum size for %s is %d", s.flavor, s.flavor.minSize())
 	}
 
@@ -270,7 +287,7 @@
 			// Version: "???",
 		},
 		InstallOptions: provisioning.InstallOptions{
-			Size:          s.Size,
+			Size:          s.size,
 			SizeUnit:      "GB",
 			Output:        s.Output,
 			Channel:       s.Channel,
@@ -500,9 +517,9 @@
 	loader := s.oem.OEM.Hardware.Bootloader
 	switch loader {
 	case "grub":
-		s.img = diskimage.NewCoreGrubImage(s.Output, s.Size, s.hardware, s.oem)
+		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.hardware, s.oem)
+		s.img = diskimage.NewCoreUBootImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem)
 	default:
 		return errors.New("no hardware description in OEM snap")
 	}