Merge lp:~mvo/snappy/snappy-snappy-bootsuccess-env2 into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Use native uboot-go code to manipulate the snappy uboot.env file.

This branch uses the native go uboot code to read/write the uboot environment.

[lp:~mvo/snappy/snappy-snappy-bootsuccess-env2]

594. By Michael Vogt on 2015-07-21

add github.com/mvo5/uboot-go

[John Lenton (chipaca)]

We need golang-uboot-dev or sth in debian/ (or vendoring). Other than that it looks very good.

review: Needs Fixing

[lp:~mvo/snappy/snappy-snappy-bootsuccess-env2]

595. By Michael Vogt on 2015-07-21

add golang-uboot-go-dev dependency

[Michael Vogt (mvo)]

Thanks! I added the missing build-dependency and upload the golang-uboot-go-dev package to the image PPA.

[lp:~mvo/snappy/snappy-snappy-bootsuccess-env2]

596. By Michael Vogt on 2015-07-22

dependencies.tsv: update uboot-go git dependency

[John Lenton (chipaca)]

I approve.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-07-01 07:30:21 +0000
+++ debian/control	2015-07-22 08:17:05 +0000
@@ -16,6 +16,7 @@
                golang-go.crypto-dev,
                golang-goconfigparser-dev,
                golang-pb-dev,
+               golang-uboot-go-dev,
                golang-yaml.v2-dev,
                python3,
                python3-markdown

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-06-29 23:15:00 +0000
+++ dependencies.tsv	2015-07-22 08:17:05 +0000
@@ -3,6 +3,7 @@
 github.com/gosexy/gettext	git	98b7b91596d20b96909e6b60d57411547dd9959c	2013-02-21T11:21:43Z
 github.com/jessevdk/go-flags	git	15347ef417a300349807983f15af9e65cd2e1b3a	2015-01-25T08:53:51Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
+github.com/mvo5/uboot-go	git	361f6ebcbb54f389d15dc9faefa000e996ba3e37	2015-07-22T06:53:46Z
 golang.org/x/crypto	git	60052bd85f2d91293457e8811b0cf26b773de469	2015-06-22T23:34:07Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z
 gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z

=== modified file 'partition/bootloader_uboot.go'
--- partition/bootloader_uboot.go	2015-07-22 08:17:05 +0000
+++ partition/bootloader_uboot.go	2015-07-22 08:17:05 +0000
@@ -29,6 +29,7 @@
 	"launchpad.net/snappy/helpers"
 
 	"github.com/mvo5/goconfigparser"
+	"github.com/mvo5/uboot-go/uenv"
 )
 
 const (
@@ -206,42 +207,47 @@
 	return os.RemoveAll(bootloaderUbootStampFile)
 }
 
-// fw_setenv gets the location of the configuration to use from the
-// file /etc/fw_env.config
 func (u *uboot) unsetBootVar(name string) error {
-	if u.hasBootVar(name) {
-		return runCommand("fw_setenv", name)
-	}
-
-	return nil
+	hasBootVar, err := u.hasBootVar(name)
+	if err != nil {
+		return err
+	}
+
+	// already unset, nothing to do
+	if !hasBootVar {
+		return nil
+	}
+
+	return u.setBootVar(name, "")
 }
 
 func (u *uboot) setBootVar(name, value string) error {
-	// we ignore the error here, the interface of fw_printenv
-	// is very simplistic, the github.com/mvo5/uboot-go code
-	// will fix that
-	curVal, _ := u.getBootVar(name)
-	if curVal != value {
-		return runCommand("fw_setenv", name, value)
-	}
-
-	return nil
+	env, err := uenv.Open(bootloaderUbootFwEnvFile)
+	if err != nil {
+		return err
+	}
+
+	// already set, nothing to do
+	if env.Get(name) == value {
+		return nil
+	}
+
+	env.Set(name, value)
+	return env.Save()
 }
 
-func (u *uboot) hasBootVar(name string) bool {
-	// FIXME: too simplistic, this will be replaces with
-	//        github.com/mvo5/uboot-go/
-	err := runCommand("fw_printenv", name)
-	return err == nil
+func (u *uboot) hasBootVar(name string) (bool, error) {
+	v, err := u.getBootVar(name)
+	return v != "", err
 }
 
 func (u *uboot) getBootVar(name string) (string, error) {
-	output, err := runCommandWithStdout("fw_printenv", "-n", name)
+	env, err := uenv.Open(bootloaderUbootFwEnvFile)
 	if err != nil {
 		return "", err
 	}
 
-	return output, nil
+	return env.Get(name), nil
 }
 
 // FIXME: this is super similar to grub now, refactor to extract the

=== modified file 'partition/bootloader_uboot_test.go'
--- partition/bootloader_uboot_test.go	2015-07-22 08:17:05 +0000
+++ partition/bootloader_uboot_test.go	2015-07-22 08:17:05 +0000
@@ -24,9 +24,12 @@
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	. "gopkg.in/check.v1"
 	"launchpad.net/snappy/helpers"
+
+	"github.com/mvo5/uboot-go/uenv"
 )
 
 // TODO move to uboot specific test suite.
@@ -322,51 +325,52 @@
 func (s *PartitionTestSuite) TestUbootMarkCurrentBootSuccessfulFwEnv(c *C) {
 	s.makeFakeUbootEnv(c)
 
-	err := ioutil.WriteFile(bootloaderUbootFwEnvFile, []byte(""), 0644)
+	env, err := uenv.Create(bootloaderUbootFwEnvFile, 4096)
+	c.Assert(err, IsNil)
+	env.Set("snappy_ab", "b")
+	env.Set("snappy_mode", "try")
+	env.Set("snappy_trial_boot", "1")
+	err = env.Save()
 	c.Assert(err, IsNil)
 
 	partition := New()
 	u := newUboot(partition)
 	c.Assert(u, NotNil)
 
-	allCommands = nil
-	runCommand = mockRunCommandWithCapture
 	err = u.MarkCurrentBootSuccessful("b")
 	c.Assert(err, IsNil)
-	c.Assert(allCommands, HasLen, 4)
-	c.Assert(allCommands[0], DeepEquals, singleCommand{"fw_printenv", bootloaderTrialBootVar})
-	c.Assert(allCommands[1], DeepEquals, singleCommand{"fw_setenv", bootloaderTrialBootVar})
-	c.Assert(allCommands[2], DeepEquals, singleCommand{"fw_setenv", bootloaderRootfsVar, "b"})
-	c.Assert(allCommands[3], DeepEquals, singleCommand{"fw_setenv", bootloaderBootmodeVar, bootloaderBootmodeSuccess})
+
+	env, err = uenv.Open(bootloaderUbootFwEnvFile)
+	c.Assert(err, IsNil)
+	c.Assert(env.String(), Equals, "snappy_ab=b\nsnappy_mode=regular\n")
 }
 
-func (s *PartitionTestSuite) TestUbootSetEnv(c *C) {
+func (s *PartitionTestSuite) TestUbootSetEnvNoUselessWrites(c *C) {
 	s.makeFakeUbootEnv(c)
 
-	err := ioutil.WriteFile(bootloaderUbootFwEnvFile, []byte(""), 0644)
-	c.Assert(err, IsNil)
+	env, err := uenv.Create(bootloaderUbootFwEnvFile, 4096)
+	c.Assert(err, IsNil)
+	env.Set("snappy_ab", "b")
+	env.Set("snappy_mode", "regular")
+	err = env.Save()
+	c.Assert(err, IsNil)
+
+	st, err := os.Stat(bootloaderUbootFwEnvFile)
+	c.Assert(err, IsNil)
+	time.Sleep(100 * time.Millisecond)
 
 	partition := New()
 	u := newUboot(partition)
 	c.Assert(u, NotNil)
 
-	// we simulate here that fw_printenv bootloaderreturns
-	runCommandWithStdout = func(args ...string) (string, error) {
-		if args[0] == "fw_printenv" && args[2] == bootloaderRootfsVar {
-			return "b", nil
-		}
-
-		return "something", nil
-	}
-
-	allCommands = nil
-	runCommand = mockRunCommandWithCapture
 	err = u.(*uboot).setBootVar(bootloaderRootfsVar, "b")
 	c.Assert(err, IsNil)
-	c.Assert(allCommands, HasLen, 0)
-
-	err = u.(*uboot).setBootVar(bootloaderRootfsVar, "a")
-	c.Assert(err, IsNil)
-	c.Assert(allCommands, HasLen, 1)
-	c.Assert(allCommands[0], DeepEquals, singleCommand{"fw_setenv", bootloaderRootfsVar, "a"})
+
+	env, err = uenv.Open(bootloaderUbootFwEnvFile)
+	c.Assert(err, IsNil)
+	c.Assert(env.String(), Equals, "snappy_ab=b\nsnappy_mode=regular\n")
+
+	st2, err := os.Stat(bootloaderUbootFwEnvFile)
+	c.Assert(err, IsNil)
+	c.Assert(st.ModTime(), Equals, st2.ModTime())
 }