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

[Sergio Schvezov]

For core images, take into account that the real size for drives can be lees that declared.

I personally tested with size 4 and 16, dd'ing to the respective cards and booting from them.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michael Vogt (mvo)]

This looks fine, the only thing I wonder if maybe a 1 MB file is enough - unless you use a sparse file in which case it does not matter.

review: Approve

[Sergio Schvezov (sergiusens)]

> This looks fine, the only thing I wonder if maybe a 1 MB file is enough -
> unless you use a sparse file in which case it does not matter.

It is sparse, the 1 and 2 are actually 1GB and 2GB

=== modified file 'sysutils/utils.go'
--- sysutils/utils.go	2015-01-21 23:22:53 +0000
+++ sysutils/utils.go	2015-03-18 03:34:33 +0000
@@ -50,7 +50,9 @@
 	case GiB:
 		size = size * 1024 * 1024 * 1024
 	case GB:
-		size = size * 1000 * 1000 * 1000
+		// The image size will be reduced to fit commercial drives that are
+		// smaller than what they claim, 975 comes from 97.5% of the total size
+		size = size * 1000 * 1000 * 975
 	default:
 		panic("improper sizing unit used")
 	}

=== added file 'sysutils/utils_test.go'
--- sysutils/utils_test.go	1970-01-01 00:00:00 +0000
+++ sysutils/utils_test.go	2015-03-18 03:34:33 +0000
@@ -0,0 +1,50 @@
+package sysutils
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	. "launchpad.net/gocheck"
+)
+
+// Hook up gocheck into the "go test" runner.
+func Test(t *testing.T) { TestingT(t) }
+
+type UtilsTestSuite struct {
+	tmpdir string
+}
+
+var _ = Suite(&UtilsTestSuite{})
+
+func (s *UtilsTestSuite) SetUpTest(c *C) {
+	s.tmpdir = c.MkDir()
+}
+
+func (s *UtilsTestSuite) TestCreateEmptyFileGiB(c *C) {
+	f := filepath.Join(s.tmpdir, "gib")
+	c.Assert(CreateEmptyFile(f, 1, GiB), IsNil)
+
+	fStat, err := os.Stat(f)
+	c.Assert(err, IsNil)
+
+	c.Assert(fStat.Size(), Equals, int64(1024*1024*1024))
+}
+
+func (s *UtilsTestSuite) TestCreateEmptyFileGB(c *C) {
+	f1 := filepath.Join(s.tmpdir, "gb")
+	c.Assert(CreateEmptyFile(f1, 1, GB), IsNil)
+
+	fStat1, err := os.Stat(f1)
+	c.Assert(err, IsNil)
+
+	c.Assert(fStat1.Size(), Equals, int64(1000*1000*975))
+
+	f2 := filepath.Join(s.tmpdir, "gb")
+	c.Assert(CreateEmptyFile(f2, 2, GB), IsNil)
+
+	fStat2, err := os.Stat(f2)
+	c.Assert(err, IsNil)
+
+	c.Assert(fStat2.Size(), Equals, int64(2*1000*1000*975))
+}