[Merge] lp:~sergiusens/goget-ubuntu-touch/lock_me_up into lp:goget-ubuntu-touch

[Ricardo Salveti]

Review: Needs Fixing

Just a small typo.

Diff comments:

> === modified file 'ubuntu-device-flash/touch.go'
> --- ubuntu-device-flash/touch.go	2014-11-03 14:07:04 +0000
> +++ ubuntu-device-flash/touch.go	2014-11-03 14:07:04 +0000
> @@ -36,7 +36,7 @@
>  	Bootstrap     bool   `long:"bootstrap" description:"bootstrap the system, do this from the bootloader"`
>  	Wipe          bool   `long:"wipe" description:"Clear all data after flashing"`
>  	Serial        string `long:"serial" description:"Serial of the device to operate"`
> -	DeveloperMode bool   `long:"developer-mode" description:"Enables developer mode after the factory reset"`
> +	DeveloperMode bool   `long:"developer-mode" description:"Enables developer mode after the factory reset, this is meant for automation and makes the device insecure by default"`
>  	DeviceTarball string `long:"device-tarball" description:"Specify a local device tarball to override the one from the server (using official Ubuntu images with custom device tarballs)"`
>  	RunScript     string `long:"run-script" description:"Run a script given by path to finish the flashing process, instead of rebooting to recovery (mostly used during development to work around quirky or incomplete recovery images)"`
>  	Password      string `long:"password" description:"This sets up the default password for the phablet user. This option is meant for CI and not general use"`
> @@ -49,6 +49,10 @@
>  var touchCmd TouchCmd
>  
>  func (touchCmd *TouchCmd) Execute(args []string) error {
> +	if touchCmd.Password || touchCmd.DeveloperMode {
> +		fmt.Println("WARNING --developer-mode and --pasword are dangerous as they remove security features from your device")

typo, password

> +	}
> +
>  	if globalArgs.TLSSkipVerify {
>  		ubuntuimage.TLSSkipVerify()
>  	}
> @@ -198,6 +202,7 @@
>  	var enableList []string
>  	if touchCmd.DeveloperMode {
>  		enableList = append(enableList, "developer_mode")
> +		enableList = append(enableList, "adb_onlock")
>  	}
>  	if touchCmd.Password != "" {
>  		enableList = append(enableList, "default_password "+touchCmd.Password)
> 


-- 
https://code.launchpad.net/~sergiusens/goget-ubuntu-touch/lock_me_up/+merge/240428
Your team Ubuntu Phablet Team is subscribed to branch lp:goget-ubuntu-touch.