Skip to content

Commit e5ad7c9

Browse files
kubikomvo5
authored andcommitted
image: clean snapd mount after preseeding
Clean left behind tmp dir for snapd mount Signed-off-by: Ondrej Kubik <[email protected]>
1 parent b3625c0 commit e5ad7c9

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

image/preseed/preseed_linux.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,9 @@ func prepareCore20Chroot(prepareImageDir, aaFeaturesDir string) (preseed *presee
390390
if err := os.RemoveAll(writableTmpDir); err != nil {
391391
fmt.Fprintf(Stdout, "%v", err)
392392
}
393+
if err := os.RemoveAll(snapdMountPath); err != nil {
394+
fmt.Fprintf(Stdout, "%v", err)
395+
}
393396
}
394397

395398
opts := &preseedOpts{

image/preseed/preseed_uc20_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,11 @@ func (s *preseedSuite) testRunPreseedUC20Happy(c *C, customAppArmorFeaturesDir s
285285
c.Assert(err, IsNil)
286286
defer r.Close()
287287

288+
// check directory targetSnapdRoot was deleted
289+
_, err = os.Stat(targetSnapdRoot)
290+
c.Assert(err, NotNil)
291+
c.Check(os.IsNotExist(err), Equals, true)
292+
288293
seen := make(map[string]bool)
289294
dec := asserts.NewDecoder(r)
290295
for {

0 commit comments

Comments
 (0)