goget-ubuntu-touch

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

  1. emupass
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 96
Merged at revision: 96
Proposed branch: lp:~sergiusens/goget-ubuntu-touch/emupass
Merge into: lp:goget-ubuntu-touch
Diff against target: 40 lines (+5/-4)
1 file modified
ubuntu-emulator/create.go (+5/-4)
To merge this branch: bzr merge lp:~sergiusens/goget-ubuntu-touch/emupass
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+242764@code.launchpad.net

Commit message

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

Description of the change

Created with

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

And tested in a phablet-shell

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

LGTM, works as expected.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-emulator/create.go'
2--- ubuntu-emulator/create.go 2014-11-03 14:30:04 +0000
3+++ ubuntu-emulator/create.go 2014-11-25 11:59:08 +0000
4@@ -39,6 +39,7 @@
5 RawDisk bool `long:"use-raw-disk" description:"Use raw disks instead of qcow2"`
6 SDCard bool `long:"with-sdcard" description:"Create an external vfat sdcard"`
7 Arch string `long:"arch" description:"Device architecture to use (i386 or armhf)"`
8+ Password string `long:"password" description:"This sets up the default password for the phablet user" default:"0000"`
9 }
10
11 var createCmd CreateCmd
12@@ -118,7 +119,7 @@
13 sdcardImage := diskimage.New(filepath.Join(dataDir, "sdcard.img"), "USERDATA", 4)
14 systemImage := diskimage.NewExisting(filepath.Join(dataDir, "system.img"))
15
16- if err := createSystem(ubuntuImage, sdcardImage, files); err != nil {
17+ if err := createCmd.createSystem(ubuntuImage, sdcardImage, files); err != nil {
18 return err
19 }
20
21@@ -179,7 +180,7 @@
22 return systemImage.ExtractFile("build.prop", filepath.Join(dataDir, "system"))
23 }
24
25-func createSystem(ubuntuImage, sdcardImage *diskimage.DiskImage, files []string) (err error) {
26+func (createCmd *CreateCmd) createSystem(ubuntuImage, sdcardImage *diskimage.DiskImage, files []string) (err error) {
27 for _, img := range []*diskimage.DiskImage{ubuntuImage, sdcardImage} {
28 if err := img.CreateExt4(); err != nil {
29 return err
30@@ -205,8 +206,8 @@
31 }
32 return err
33 }
34- fmt.Println("Setting up a default password for phablet to: '0000'")
35- if err := ubuntuImage.SetPassword("phablet", "0000"); err != nil {
36+ fmt.Printf("Setting up a default password for phablet to: '%s'\n", createCmd.Password)
37+ if err := ubuntuImage.SetPassword("phablet", createCmd.Password); err != nil {
38 if err := ubuntuImage.Unmount(); err != nil {
39 fmt.Println("Unmount error :", err)
40 }

Subscribers

People subscribed via source and target branches