Merge lp:~mvo/snappy/snappy-snapfs-cleanup-kernel-assets into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Cleanup kernel assets on remove

[lp:~mvo/snappy/snappy-snapfs-cleanup-kernel-assets]

782. By Michael Vogt on 2015-10-20

remove kernel assets in /boot/ on snap removal

[John Lenton (chipaca)]

Looks good. But a question.

review: Approve

[Michael Vogt (mvo)]

Thanks! Fixed the code as suggested.

Unmerged revisions

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)

780. By Michael Vogt on 2015-10-20

go fmt

779. By Michael Vogt on 2015-10-20

partition/partition.go: IsNextBootOther() is always false on all-snap systems

778. By Michael Vogt on 2015-10-20

add missing tests for reboot-required reporting

777. By Michael Vogt on 2015-10-20

partition/bootloader.go: its ok to not have an "other" partition

776. By Michael Vogt on 2015-10-20

snappy/snapp.go: detect if kernel/os needs reboot

775. By Michael Vogt on 2015-10-20

partition/bootloader.go: do not crash if "/" is not system-{a,b}

774. By Michael Vogt on 2015-10-19

fix tests

773. By Michael Vogt on 2015-10-19

mered lp:snappy

=== modified file 'snappy/kernel.go'
--- snappy/kernel.go	2015-10-20 08:49:57 +0000
+++ snappy/kernel.go	2015-10-20 08:49:57 +0000
@@ -67,3 +67,14 @@
 
 	return nil
 }
+
+func removeKernel(s *SnapPart) error {
+	bootdir := partition.BootloaderDir()
+	if err := os.MkdirAll(filepath.Join(bootdir, s.Version()), 0755); err !=
+		nil {
+		return err
+	}
+	blobName := filepath.Base(snapfs.BlobPath(s.basedir))
+	dstDir := filepath.Join(bootdir, blobName)
+	return os.RemoveAll(dstDir)
+}

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-10-20 08:49:57 +0000
+++ snappy/snapp.go	2015-10-20 08:49:57 +0000
@@ -1211,6 +1211,13 @@
 		return err
 	}
 
+	// FIXME: this needs to go into a special kernel snap
+	if s.m.Type == pkg.TypeKernel {
+		if err := removeKernel(s); err != nil {
+			logger.Noticef("Failed to remove kernel assets %s", err)
+		}
+	}
+
 	// best effort(?)
 	os.Remove(filepath.Dir(s.basedir))
 

=== modified file 'snappy/snapp_snapfs_test.go'
--- snappy/snapp_snapfs_test.go	2015-10-20 08:49:57 +0000
+++ snappy/snapp_snapfs_test.go	2015-10-20 08:49:57 +0000
@@ -329,3 +329,23 @@
 	mockb.bootvars["snappy_kernel"] = "ubuntu-kernel." + testOrigin + "_4.0-1.snap"
 	c.Assert(snap.NeedsReboot(), Equals, true)
 }
+
+func (s *SnapfsTestSuite) TestInstallKernelSnapRemovesKernelAssets(c *C) {
+	files := [][]string{
+		{"vmlinuz-4.2", "I'm a kernel"},
+		{"initrd.img-4.2", "...and I'm an initrd"},
+	}
+	snapPkg := makeTestSnapPackageWithFiles(c, packageKernel, files)
+	part, err := NewSnapPartFromSnapFile(snapPkg, "origin", true)
+	c.Assert(err, IsNil)
+
+	_, err = part.Install(&MockProgressMeter{}, 0)
+	c.Assert(err, IsNil)
+	kernelAssetsDir := filepath.Join(s.mockBootloaderDir, "ubuntu-kernel.origin_4.0-1.snap")
+	c.Assert(helpers.FileExists(kernelAssetsDir), Equals, true)
+
+	// ensure uninstall cleans the kernel assets
+	err = part.Uninstall(&MockProgressMeter{})
+	c.Assert(err, IsNil)
+	c.Assert(helpers.FileExists(kernelAssetsDir), Equals, false)
+}