Merge lp:~xnox/goget-ubuntu-touch/product-uuid into lp:goget-ubuntu-touch

[Dimitri John Ledkov]

Enable unique & persistent whoopsie ids, per ubuntu-emulator instance

Enable unique & persistent whoopsie ids, per ubuntu-emulator instance

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-i386-ci/25

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

review: Approve (continuous-integration)

[Brian Murray (brian-murray)]

Do these changes allow one to manually set the CRASH_DB_IDENTIFIER? I ask as in bug 1324455 we want to be able to setup CRASH_DB_IDENTIFIER to start with deadbeef for systems under automated testing so that they are not counted in crash counters.

Otherwise this looks okay to me.

[Dimitri John Ledkov (xnox)]

On 17 September 2014 20:05, Brian Murray <email address hidden> wrote:
> Do these changes allow one to manually set the CRASH_DB_IDENTIFIER? I ask as in bug 1324455 we want to be able to setup CRASH_DB_IDENTIFIER to start with deadbeef for systems under automated testing so that they are not counted in crash counters.
>

yes.

> Otherwise this looks okay to me.
> --
> https://code.launchpad.net/~xnox/goget-ubuntu-touch/product-uuid/+merge/229315
> You are the owner of lp:~xnox/goget-ubuntu-touch/product-uuid.

--
Regards,

Dimitri.

[Dimitri John Ledkov (xnox)]

ping, why was this still not merged?

[Brian Murray (brian-murray)]

review: Approve

[Sergio Schvezov (sergiusens)]

Since we error on not being able to read the uuid, how are we going to communicate in a friendly way that people might need to regen their emulator images?

[Dimitri John Ledkov (xnox)]

No, that's not what the logic is.

Check if uuid exist, if not write it out.
Read uuid, return uuid.

Thus if it's non-existant it is created on the fly. Thus there is no regeneration required.

[Sergio Schvezov (sergiusens)]

review: Approve

[Sergio Schvezov (sergiusens)]

Can you merge trunk?

[Brian Murray (brian-murray)]

Is this useful anymore?

Unmerged revisions

62. By Dimitri John Ledkov on 2014-08-02

Customize-in whoopsie-id, since !intel does not support dmi/id/product_uuid

61. By Dimitri John Ledkov on 2014-08-02

Enable product_uuid on ubuntu-emulator.

=== modified file 'debian/control'
--- debian/control	2014-06-18 20:57:12 +0000
+++ debian/control	2014-08-02 05:04:35 +0000
@@ -9,6 +9,7 @@
                golang-go-flags-dev,
                golang-gocheck-dev,
                golang-pb-dev,
+               golang-uuid-dev,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/goget-ubuntu-touch
 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/goget-ubuntu-touch/trunk/files

=== modified file 'ubuntu-emulator/create.go'
--- ubuntu-emulator/create.go	2014-07-02 18:45:34 +0000
+++ ubuntu-emulator/create.go	2014-08-02 05:04:35 +0000
@@ -109,6 +109,10 @@
 	if os.MkdirAll(dataDir, 0700) != nil {
 		return err
 	}
+	//First generate UUID & Whoopsie-id as a regular user
+	if err = sysutils.WriteWhoopsieStamp(dataDir); err != nil {
+		return err
+	}
 
 	fmt.Println("Setting up...")
 	//This image will later be copied into sdcard.img as system.img and will hold the Ubuntu rootfs

=== modified file 'ubuntu-emulator/diskimage/image.go'
--- ubuntu-emulator/diskimage/image.go	2014-07-02 18:45:34 +0000
+++ ubuntu-emulator/diskimage/image.go	2014-08-02 05:04:35 +0000
@@ -27,6 +27,7 @@
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 
 	"launchpad.net/goget-ubuntu-touch/ubuntu-emulator/sysutils"
@@ -138,6 +139,15 @@
 	if err := img.unpackSystem(); err != nil {
 		return err
 	}
+
+	dataDir := path.Dir(img.path)
+	//Generate unique instance .uuid and .whoopsie-id
+	whoopsieid, err := sysutils.ReadWhoopsieStamp(dataDir)
+	if err != nil {
+		return err
+	}
+	setupFiles = append(setupFiles, []setupFile{{"etc/init/whoopsie.override", "env CRASH_DB_IDENTIFIER=" + whoopsieid}}...)
+
 	for _, file := range setupFiles {
 		if err := img.writeFile(file); err != nil {
 			return err

=== modified file 'ubuntu-emulator/run.go'
--- ubuntu-emulator/run.go	2014-07-08 19:31:13 +0000
+++ ubuntu-emulator/run.go	2014-08-02 05:04:35 +0000
@@ -89,6 +89,10 @@
 	if err != nil {
 		return err
 	}
+	uuid, err := sysutils.ReadUUIDStamp(dataDir)
+	if err != nil {
+		return err
+	}
 	var deviceInfo map[string]string
 	if d, ok := devices[device]; ok {
 		deviceInfo = d
@@ -114,7 +118,7 @@
 		"-gpu", "on",
 		"-scale", runCmd.Scale,
 		"-shell", "-no-jni", "-show-kernel", "-verbose",
-		"-qemu",
+		"-qemu", "-uuid", uuid,
 	}
 
 	if cpu, ok := deviceInfo["cpu"]; ok {

=== modified file 'ubuntu-emulator/sysutils/stamp.go'
--- ubuntu-emulator/sysutils/stamp.go	2014-04-23 18:09:19 +0000
+++ ubuntu-emulator/sysutils/stamp.go	2014-08-02 05:04:35 +0000
@@ -21,11 +21,15 @@
 
 import (
 	"bufio"
+	"code.google.com/p/go-uuid/uuid"
+	"crypto/sha512"
+	"encoding/hex"
 	"encoding/json"
 	"io/ioutil"
 	"launchpad.net/goget-ubuntu-touch/ubuntuimage"
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 func WriteDeviceStamp(dataDir, device string) (err error) {
@@ -42,6 +46,58 @@
 	return string(device), nil
 }
 
+func WriteUUIDStamp(dataDir string) (err error) {
+	path := filepath.Join(dataDir, ".uuid")
+	return ioutil.WriteFile(path, []byte(strings.ToUpper(uuid.New())), 0600)
+}
+
+func ReadUUIDStamp(dataDir string) (string, error) {
+	path := filepath.Join(dataDir, ".uuid")
+
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		err = WriteUUIDStamp(dataDir)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	uuid, err := ioutil.ReadFile(path)
+	if err != nil {
+		return "", err
+	}
+	return string(uuid), nil
+}
+
+func WriteWhoopsieStamp(dataDir string) (err error) {
+	uuid, err := ReadUUIDStamp(dataDir)
+	if err != nil {
+		return err
+	}
+
+	path := filepath.Join(dataDir, ".whoopsie-id")
+	hasher := sha512.New()
+	hasher.Write([]byte(uuid))
+	hash := hex.EncodeToString(hasher.Sum(nil))
+	return ioutil.WriteFile(path, []byte(hash), 0600)
+}
+
+func ReadWhoopsieStamp(dataDir string) (string, error) {
+	path := filepath.Join(dataDir, ".whoopsie-id")
+
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		err = WriteWhoopsieStamp(dataDir)
+		if err != nil {
+			return "", err
+		}
+	}
+
+	whoopsieid, err := ioutil.ReadFile(path)
+	if err != nil {
+		return "", err
+	}
+	return string(whoopsieid), nil
+}
+
 func WriteStamp(dataDir string, image ubuntuimage.Image) (err error) {
 	path := filepath.Join(dataDir, ".stamp")
 	file, err := os.Create(path)