Merge lp:~mvo/snappy/snappy-clickpkg-snappypkg-meh into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Try both clickpkg and snappypkg when dropping privs.

Try both clickpkg and snappypkg when dropping privs.

[Sergio Schvezov (sergiusens)]

it seems like it is going to work

[Sergio Schvezov (sergiusens)]

once this lands we need to push it to wily and tools-proposed

works like a charm for building 15.04 and rolling.

review: Approve

=== modified file 'cmd/snappy/cmd_internal_unpack.go'
--- cmd/snappy/cmd_internal_unpack.go	2015-06-26 12:56:53 +0000
+++ cmd/snappy/cmd_internal_unpack.go	2015-07-02 16:02:25 +0000
@@ -49,9 +49,11 @@
 // }
 import "C"
 
-// for compat with the old snappy, once that is gone we can drop to a
-// different user
-const dropPrivsUser = "snappypkg"
+// we keep supporting clickpkg for compat with older images
+var dropPrivsUsers = []string{
+	"snappypkg",
+	"clickpkg",
+}
 
 type cmdInternalUnpack struct {
 	Positional struct {
@@ -123,8 +125,18 @@
 	defer d.Close()
 
 	if helpers.ShouldDropPrivs() {
+		var dropPrivsUser string
 
+		// first find out what user to use
 		passFile := passwdFile(rootDir, "passwd")
+		for _, dropPrivsUser = range dropPrivsUsers {
+			_, err := readUID(dropPrivsUser, passFile)
+			if err == nil {
+				break
+			}
+		}
+
+		// then get uid/gid
 		uid, err := readUID(dropPrivsUser, passFile)
 		if err != nil {
 			return err

=== renamed file 'cmd/snappy/cmd_low_level_unpack_test.go' => 'cmd/snappy/cmd_internal_unpack_test.go'