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

[Sergio Schvezov]

ubuntu-device-flash: adding option to only enable ssh and another option to not pre provision cloud data

[James Hunt (jamesodhunt)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/116/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

this seems to have been worked on somewhere else

review: Disapprove

Unmerged revisions

115. By Sergio Schvezov on 2014-12-08

Adding option to setup only ssh and another one to not provision cloud-init

114. By Sergio Schvezov on 2014-12-08

empty, unprovisioned formatted system-b

=== modified file 'diskimage/image.go'
--- diskimage/image.go	2014-11-28 12:28:57 +0000
+++ diskimage/image.go	2014-12-08 15:13:36 +0000
@@ -130,22 +130,16 @@
 }
 
 //System returns the system path
-func (img *DiskImage) System() ([]string, error) {
+func (img *DiskImage) System() (string, error) {
 	if img.parts == nil {
-		return nil, errors.New("img is not setup with partitions")
+		return "", errors.New("img is not setup with partitions")
 	}
 
 	if img.Mountpoint == "" {
-		return nil, errors.New("img not mounted")
-	}
-
-	paths := []string{filepath.Join(img.Mountpoint, string(systemADir))}
-
-	if len(img.parts) == 3 {
-		paths = append(paths, filepath.Join(img.Mountpoint, string(systemBDir)))
-	}
-
-	return paths, nil
+		return "", errors.New("img not mounted")
+	}
+
+	return filepath.Join(img.Mountpoint, string(systemADir)), nil
 }
 
 //Mount the DiskImage
 
=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2014-12-04 20:56:49 +0000
+++ ubuntu-device-flash/core.go	2014-12-08 15:13:36 +0000
@@ -52,8 +52,10 @@
 	Keyboard      string `long:"keyboard-layout" description:"Specify the keyboard layout" default:"us"`
 	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 6)" default:"20"`
-	DeveloperMode bool   `long:"developer-mode" description:"Finds the latest public key in your ~/.ssh and sets it up"`
+	DeveloperMode bool   `long:"developer-mode" description:"Finds the latest public key in your ~/.ssh and sets it up using cloud-init"`
 	Single        bool   `long:"single-partition" description:"Sets up a single system partiton"`
+	EnableSsh     bool   `long:"enable-ssh" description:"Enable ssh on the image through cloud-init(not need with developer mode)"`
+	Cloud         bool   `long:"cloud" description:"Generate a pure cloud image without setting up cloud-init"`
 }
 
 var coreCmd CoreCmd
@@ -75,6 +77,10 @@
 `
 
 func (coreCmd *CoreCmd) Execute(args []string) error {
+	if coreCmd.EnableSsh && coreCmd.Cloud {
+		return errors.New("--cloud and --enable-ssh cannot be used together")
+	}
+
 	if syscall.Getuid() != 0 {
 		return errors.New("command requires sudo/pkexec (root)")
 	}
@@ -212,25 +218,11 @@
 		}
 	}
 
-	systemPaths, err := img.System()
-	if err != nil {
-		return err
-	}
-
 	userPath, err := img.User()
 	if err != nil {
 		return err
 	}
 
-	if !coreCmd.Single {
-		src := fmt.Sprintf("%s/system/.", img.Mountpoint)
-		dst := fmt.Sprintf("%s/system-b", img.Mountpoint)
-		cmd := exec.Command("cp", "-r", "--preserve=all", src, dst)
-		if out, err := cmd.CombinedOutput(); err != nil {
-			return fmt.Errorf("failed to replicate image contents: %s", out)
-		}
-	}
-
 	for _, dir := range []string{"system-data", "cache"} {
 		dirPath := filepath.Join(userPath, dir)
 		if err := os.Mkdir(dirPath, 0755); err != nil {
@@ -238,24 +230,29 @@
 		}
 	}
 
-	cloudBaseDir := filepath.Join("var", "lib", "cloud")
-
-	for i := range systemPaths {
-		if err := coreCmd.setupBootloader(systemPaths[i]); err != nil {
-			return err
-		}
-
-		if err := coreCmd.setupKeyboardLayout(systemPaths[i]); err != nil {
-			return err
-		}
-
-		if err := os.MkdirAll(filepath.Join(systemPaths[i], cloudBaseDir), 0755); err != nil {
-			return err
-		}
-	}
-
-	if err := coreCmd.setupCloudInit(cloudBaseDir, filepath.Join(userPath, "system-data")); err != nil {
-		return err
+	systemPath, err := img.System()
+	if err != nil {
+		return err
+	}
+
+	if err := coreCmd.setupBootloader(systemPath); err != nil {
+		return err
+	}
+
+	if err := coreCmd.setupKeyboardLayout(systemPath); err != nil {
+		return err
+	}
+
+	if !coreCmd.Cloud {
+		cloudBaseDir := filepath.Join("var", "lib", "cloud")
+
+		if err := os.MkdirAll(filepath.Join(systemPath, cloudBaseDir), 0755); err != nil {
+			return err
+		}
+
+		if err := coreCmd.setupCloudInit(cloudBaseDir, filepath.Join(userPath, "system-data")); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -306,7 +303,7 @@
 		return err
 	}
 
-	if coreCmd.DeveloperMode {
+	if coreCmd.DeveloperMode || coreCmd.EnableSsh {
 		if _, err := io.WriteString(userDataFile, "snappy:\n    ssh_enabled: True\n"); err != nil {
 			return err
 		}