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

[Sergio Schvezov]

ubuntu-emulator: allow setting a default password for the phablet user when creating

Created with

$ sudo ./ubuntu-emulator create --password 1234 differentpass
...
Setting up a default password for phablet to: '1234'
...

And tested in a phablet-shell

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM, works as expected.

review: Approve

=== modified file 'ubuntu-emulator/create.go'
--- ubuntu-emulator/create.go	2014-11-03 14:30:04 +0000
+++ ubuntu-emulator/create.go	2014-11-25 11:59:08 +0000
@@ -39,6 +39,7 @@
 	RawDisk  bool   `long:"use-raw-disk" description:"Use raw disks instead of qcow2"`
 	SDCard   bool   `long:"with-sdcard" description:"Create an external vfat sdcard"`
 	Arch     string `long:"arch" description:"Device architecture to use (i386 or armhf)"`
+	Password string `long:"password" description:"This sets up the default password for the phablet user" default:"0000"`
 }
 
 var createCmd CreateCmd
@@ -118,7 +119,7 @@
 	sdcardImage := diskimage.New(filepath.Join(dataDir, "sdcard.img"), "USERDATA", 4)
 	systemImage := diskimage.NewExisting(filepath.Join(dataDir, "system.img"))
 
-	if err := createSystem(ubuntuImage, sdcardImage, files); err != nil {
+	if err := createCmd.createSystem(ubuntuImage, sdcardImage, files); err != nil {
 		return err
 	}
 
@@ -179,7 +180,7 @@
 	return systemImage.ExtractFile("build.prop", filepath.Join(dataDir, "system"))
 }
 
-func createSystem(ubuntuImage, sdcardImage *diskimage.DiskImage, files []string) (err error) {
+func (createCmd *CreateCmd) createSystem(ubuntuImage, sdcardImage *diskimage.DiskImage, files []string) (err error) {
 	for _, img := range []*diskimage.DiskImage{ubuntuImage, sdcardImage} {
 		if err := img.CreateExt4(); err != nil {
 			return err
@@ -205,8 +206,8 @@
 		}
 		return err
 	}
-	fmt.Println("Setting up a default password for phablet to: '0000'")
-	if err := ubuntuImage.SetPassword("phablet", "0000"); err != nil {
+	fmt.Printf("Setting up a default password for phablet to: '%s'\n", createCmd.Password)
+	if err := ubuntuImage.SetPassword("phablet", createCmd.Password); err != nil {
 		if err := ubuntuImage.Unmount(); err != nil {
 			fmt.Println("Unmount error :", err)
 		}