1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151 | diff --git a/cmd/snap-update-ns/change.go b/cmd/snap-update-ns/change.go
index da69298df..b1b26c8f5 100644
--- a/cmd/snap-update-ns/change.go
+++ b/cmd/snap-update-ns/change.go
@@ -106,7 +106,7 @@ func (c *Change) lowLevelPerform() error {
// lists are processed and a "diff" of mount changes is produced. The mount
// changes, when applied in order, transform the current profile into the
// desired profile.
-func NeededChanges(currentProfile, desiredProfile *mount.Profile) []Change {
+func NeededChanges(currentProfile, desiredProfile *mount.Profile) []*Change {
// Copy both profiles as we will want to mutate them.
current := make([]mount.Entry, len(currentProfile.Entries))
copy(current, currentProfile.Entries)
@@ -154,21 +154,21 @@ func NeededChanges(currentProfile, desiredProfile *mount.Profile) []Change {
}
// We are now ready to compute the necessary mount changes.
- var changes []Change
+ var changes []*Change
// Unmount entries not reused in reverse to handle children before their parent.
for i := len(current) - 1; i >= 0; i-- {
if reuse[current[i].Dir] {
- changes = append(changes, Change{Action: Keep, Entry: current[i]})
+ changes = append(changes, &Change{Action: Keep, Entry: current[i]})
} else {
- changes = append(changes, Change{Action: Unmount, Entry: current[i]})
+ changes = append(changes, &Change{Action: Unmount, Entry: current[i]})
}
}
// Mount desired entries not reused.
for i := range desired {
if !reuse[desired[i].Dir] {
- changes = append(changes, Change{Action: Mount, Entry: desired[i]})
+ changes = append(changes, &Change{Action: Mount, Entry: desired[i]})
}
}
diff --git a/cmd/snap-update-ns/change_test.go b/cmd/snap-update-ns/change_test.go
index 75020e180..81ca8129a 100644
--- a/cmd/snap-update-ns/change_test.go
+++ b/cmd/snap-update-ns/change_test.go
@@ -75,7 +75,7 @@ func (s *changeSuite) TestNeededChangesNoChange(c *C) {
current := &mount.Profile{Entries: []mount.Entry{{Dir: "/common/stuf"}}}
desired := &mount.Profile{Entries: []mount.Entry{{Dir: "/common/stuf"}}}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: mount.Entry{Dir: "/common/stuf"}, Action: update.Keep},
})
}
@@ -85,7 +85,7 @@ func (s *changeSuite) TestNeededChangesTrivialMount(c *C) {
current := &mount.Profile{}
desired := &mount.Profile{Entries: []mount.Entry{{Dir: "/common/stuf"}}}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: desired.Entries[0], Action: update.Mount},
})
}
@@ -95,7 +95,7 @@ func (s *changeSuite) TestNeededChangesTrivialUnmount(c *C) {
current := &mount.Profile{Entries: []mount.Entry{{Dir: "/common/stuf"}}}
desired := &mount.Profile{}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: current.Entries[0], Action: update.Unmount},
})
}
@@ -108,7 +108,7 @@ func (s *changeSuite) TestNeededChangesUnmountOrder(c *C) {
}}
desired := &mount.Profile{}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: mount.Entry{Dir: "/common/stuf/extra"}, Action: update.Unmount},
{Entry: mount.Entry{Dir: "/common/stuf"}, Action: update.Unmount},
})
@@ -122,7 +122,7 @@ func (s *changeSuite) TestNeededChangesMountOrder(c *C) {
{Dir: "/common/stuf"},
}}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: mount.Entry{Dir: "/common/stuf"}, Action: update.Mount},
{Entry: mount.Entry{Dir: "/common/stuf/extra"}, Action: update.Mount},
})
@@ -141,7 +141,7 @@ func (s *changeSuite) TestNeededChangesChangedParentSameChild(c *C) {
{Dir: "/common/unrelated"},
}}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: mount.Entry{Dir: "/common/unrelated"}, Action: update.Keep},
{Entry: mount.Entry{Dir: "/common/stuf/extra"}, Action: update.Unmount},
{Entry: mount.Entry{Dir: "/common/stuf", Name: "/dev/sda1"}, Action: update.Unmount},
@@ -163,7 +163,7 @@ func (s *changeSuite) TestNeededChangesSameParentChangedChild(c *C) {
{Dir: "/common/unrelated"},
}}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: mount.Entry{Dir: "/common/unrelated"}, Action: update.Keep},
{Entry: mount.Entry{Dir: "/common/stuf/extra", Name: "/dev/sda1"}, Action: update.Unmount},
{Entry: mount.Entry{Dir: "/common/stuf"}, Action: update.Keep},
@@ -189,7 +189,7 @@ func (s *changeSuite) TestNeededChangesSmartEntryComparison(c *C) {
{Dir: "/a/b/c"},
}}
changes := update.NeededChanges(current, desired)
- c.Assert(changes, DeepEquals, []update.Change{
+ c.Assert(changes, DeepEquals, []*update.Change{
{Entry: mount.Entry{Dir: "/a/b/c"}, Action: update.Unmount},
{Entry: mount.Entry{Dir: "/a/b", Name: "/dev/sda1"}, Action: update.Unmount},
{Entry: mount.Entry{Dir: "/a/b-1/3"}, Action: update.Unmount},
diff --git a/cmd/snap-update-ns/main.go b/cmd/snap-update-ns/main.go
index cfbb2a2a1..38fb32470 100644
--- a/cmd/snap-update-ns/main.go
+++ b/cmd/snap-update-ns/main.go
@@ -161,7 +161,7 @@ func run() error {
logger.Noticef("cannot change mount namespace of snap %q according to change %s: %s", snapName, change, err)
continue
}
- changesMade = append(changesMade, &change)
+ changesMade = append(changesMade, change)
}
// Compute the new current profile so that it contains only changes that were made
@@ -192,7 +192,7 @@ func debugShowProfile(profile *mount.Profile, header string) {
}
}
-func debugShowChanges(changes []Change, header string) {
+func debugShowChanges(changes []*Change, header string) {
if len(changes) > 0 {
logger.Debugf("%s:", header)
for _, change := range changes {
diff --git a/tests/main/interfaces-desktop/task.yaml b/tests/main/interfaces-desktop/task.yaml
index 8cd50029b..6d4a33e13 100644
--- a/tests/main/interfaces-desktop/task.yaml
+++ b/tests/main/interfaces-desktop/task.yaml
@@ -8,6 +8,9 @@ details: |
systems: [-ubuntu-core-*]
+environment:
+ SNAPD_DEBUG: 1
+
prepare: |
echo "Given the desktop snap is installed"
snap try $TESTSLIB/snaps/test-snapd-desktop
|