Merge lp:~mvo/snappy/snappy-snapfs-fix-os-image-build into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Preserve uid/gid in the squashfs images to allow creating proper os/kernel snaps.

[Sergio Schvezov (sergiusens)]

this was the culprit i hope

review: Approve

[lp:~mvo/snappy/snappy-snapfs-fix-os-image-build]

790. By Michael Vogt on 2015-10-21

snappy/build.go: ensure build preserves the permissions

Unmerged revisions

790. By Michael Vogt on 2015-10-21

snappy/build.go: ensure build preserves the permissions

789. By Michael Vogt on 2015-10-21

pkg/snapfs/snapfs.go: remove -all-root from mksquashfs

788. By Michael Vogt on 2015-10-21

partition/bootloader_grub.go: use the right grub-env when globalrootdir is set

787. By Michael Vogt on 2015-10-21

snappy/kernel.go: use GlobalRootDir in unpackKernel

786. By Michael Vogt on 2015-10-21

partition/bootloader.go: do not crash if there is no otherRootPartition

785. By Michael Vogt on 2015-10-20

merged lp:snappy

784. By Michael Vogt on 2015-10-20

add boot-ok for new-style all-snaps

783. By Michael Vogt on 2015-10-20

disallow removal of the active kernel and os

782. By Michael Vogt on 2015-10-20

remove kernel assets in /boot/ on snap removal

781. By Michael Vogt on 2015-10-20

show a reboot required message (not complete yet)

=== modified file 'pkg/snapfs/snapfs.go'
--- pkg/snapfs/snapfs.go	2015-10-21 15:06:18 +0000
+++ pkg/snapfs/snapfs.go	2015-10-21 15:06:18 +0000
@@ -160,7 +160,6 @@
 		return runCommand(
 			"mksquashfs",
 			".", fullSnapPath,
-			"-all-root",
 			"-noappend",
 			"-comp", "xz")
 	})
 
=== modified file 'snappy/build.go'
--- snappy/build.go	2015-10-11 11:09:36 +0000
+++ snappy/build.go	2015-10-21 15:06:18 +0000
@@ -441,7 +441,10 @@
 
 		// handle dirs
 		if info.IsDir() {
-			return os.Mkdir(dest, info.Mode())
+			if err := os.Mkdir(dest, info.Mode()); err != nil {
+				return err
+			}
+			return os.Chown(dest, int(info.Sys().(*syscall.Stat_t).Uid), int(info.Sys().(*syscall.Stat_t).Gid))
 		}
 
 		// handle char/block devices
@@ -467,8 +470,8 @@
 			// whee
 			return nil
 		}
-		// sigh. ok, copy it is.
-		return helpers.CopyFile(path, dest, helpers.CopyFlagDefault)
+		// CopySpecialFile preserves permissions and owner
+		return helpers.CopySpecialFile(path, dest)
 	})
 }