-
Notifications
You must be signed in to change notification settings - Fork 573
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cmd/snap-update-ns: keep order of existing mount entries #14494
Open
zyga
wants to merge
6
commits into
canonical:master
Choose a base branch
from
zyga:fix/order-of-saved-profile-SNAPDENG-31644
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
74fc596
cmd/snap-update-ns: add test explaining content-layout bugs
zyga 42f4624
cmd/snap-update-ns: add Change.GoString
zyga 730370a
osutil: document MountEntry fields
zyga aaceabb
cmd/snap-update-ns: keep order of existing mount entries
zyga 09137ba
cmd/snap-update-ns: add CurrentProfileFromChanges made
zyga 9e187a7
cmd/snap-update-ns: document CurrentProfileFromChangesMade
zyga File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,246 @@ | ||
| // -*- Mode: Go; indent-tabs-mode: t -*- | ||
|
|
||
| /* | ||
| * Copyright (C) 2024 Canonical Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package main_test | ||
|
|
||
| import ( | ||
| . "gopkg.in/check.v1" | ||
|
|
||
| update "github.com/snapcore/snapd/cmd/snap-update-ns" | ||
| "github.com/snapcore/snapd/osutil" | ||
| ) | ||
|
|
||
| func (s *changeSuite) TestContentLayout1InitiallyConnected(c *C) { | ||
| // NOTE: This doesn't measure what is going on during construction. It | ||
| // merely measures what is constructed is stable and that it does not cause | ||
| // further changes to be created. | ||
| current, err := osutil.LoadMountProfile("testdata/content-layout-1-initially-connected.current.fstab") | ||
| c.Assert(err, IsNil) | ||
| desired, err := osutil.LoadMountProfile("testdata/content-layout-1-initially-connected.desired.fstab") | ||
| c.Assert(err, IsNil) | ||
| changes := update.NeededChanges(current, desired) | ||
| showCurrentDesiredAndChanges(c, current, desired, changes) | ||
|
|
||
| // The change plan is to do nothing. | ||
| // Note that the order of entries is back to front. | ||
| // | ||
| // At this time, the mount namespace is correct: | ||
| // zyga@wyzima:/run/snapd/ns$ sudo nsenter -mtest-snapd-content-layout.mnt | ||
| // root@wyzima:/# ls -l /usr/share/secureboot/potato | ||
| // total 1 | ||
| // -rw-rw-r-- 1 root root 22 Aug 30 09:36 canary.txt | ||
| // drwxrwxr-x 2 root root 32 Aug 30 09:36 meta | ||
| // root@wyzima:/# ls -l /snap/test-snapd-content-layout/ | ||
| // current/ x1/ x2/ | ||
| // root@wyzima:/# ls -l /snap/test-snapd-content-layout/x2/attached-content/ | ||
| // total 1 | ||
| // -rw-rw-r-- 1 root root 22 Aug 30 09:36 canary.txt | ||
| // drwxrwxr-x 2 root root 32 Aug 30 09:36 meta | ||
| c.Assert(changes, DeepEquals, []*update.Change{ | ||
| {Action: "keep", Entry: current.Entries[4]}, | ||
| {Action: "keep", Entry: current.Entries[3]}, | ||
| {Action: "keep", Entry: current.Entries[2]}, | ||
| {Action: "keep", Entry: current.Entries[1]}, | ||
| {Action: "keep", Entry: current.Entries[0]}, | ||
| }) | ||
| } | ||
|
|
||
| func (s *changeSuite) TestContentLayout2InitiallyConnectedThenDisconnected(c *C) { | ||
| current, err := osutil.LoadMountProfile("testdata/content-layout-1-initially-connected.current.fstab") | ||
| c.Assert(err, IsNil) | ||
| desired, err := osutil.LoadMountProfile("testdata/content-layout-2-after-disconnect.desired.fstab") | ||
| c.Assert(err, IsNil) | ||
| changes := update.NeededChanges(current, desired) | ||
| showCurrentDesiredAndChanges(c, current, desired, changes) | ||
|
|
||
| // The change plan is to do detach the content entry. | ||
| // | ||
| // Detached entries are first isolated from mount propagation. So the bug | ||
| // here is that the mount entry propagated to the layout during initial | ||
| // construction sticks around and is not updated. This is a bug. | ||
| // This is tracked as https://warthogs.atlassian.net/browse/SNAPDENG-31645 | ||
| // | ||
| // zyga@wyzima:/run/snapd/ns$ sudo nsenter -mtest-snapd-content-layout.mnt | ||
| // root@wyzima:/# ls -l /snap/test-snapd-content-layout/x2/attached-content/ | ||
| // total 1 | ||
| // -rw-rw-r-- 1 root root 46 Aug 30 09:36 hidden | ||
| // root@wyzima:/# ls -l /usr/share/secureboot/potato | ||
| // total 1 | ||
| // -rw-rw-r-- 1 root root 22 Aug 30 09:36 canary.txt | ||
| // drwxrwxr-x 2 root root 32 Aug 30 09:36 meta | ||
| // | ||
| // Note that the order of entries is back to front. There is another bug | ||
| // here, although it is not visible from the change plan alone. The reverse | ||
| // order of mount entries listed here is actually stored as the new current | ||
| // mount profile. This is tracked as | ||
| // https://warthogs.atlassian.net/browse/SNAPDENG-31644 | ||
| c.Assert(changes, DeepEquals, []*update.Change{ | ||
| {Action: "keep", Entry: current.Entries[4]}, | ||
| {Action: "keep", Entry: current.Entries[3]}, | ||
| {Action: "keep", Entry: current.Entries[2]}, | ||
| {Action: "unmount", Entry: withDetachOption(current.Entries[1])}, | ||
| {Action: "keep", Entry: current.Entries[0]}, | ||
| }) | ||
|
|
||
| // The actual entry for clarity. | ||
| c.Assert(changes[3].Entry, DeepEquals, osutil.MountEntry{ | ||
| Name: "/snap/test-snapd-content/x1", | ||
| Dir: "/snap/test-snapd-content-layout/x2/attached-content", | ||
| Type: "none", | ||
| Options: []string{"bind", "ro", "x-snapd.detach"}, | ||
| }) | ||
| } | ||
|
|
||
| func (s *changeSuite) TestContentLayout3InitiallyConnectedThenDisconnectedAndReconnected(c *C) { | ||
| current, err := osutil.LoadMountProfile("testdata/content-layout-2-after-disconnect.current.fstab") | ||
| c.Assert(err, IsNil) | ||
| desired, err := osutil.LoadMountProfile("testdata/content-layout-3-after-reconnect.desired.fstab") | ||
| c.Assert(err, IsNil) | ||
| changes := update.NeededChanges(current, desired) | ||
| showCurrentDesiredAndChanges(c, current, desired, changes) | ||
|
|
||
| // In theory we should get back to the initial state but the reality is | ||
| // much more complicated. The change looks good on paper but the | ||
| // propagation that is not taken into account makes the actual mount | ||
| // namespace incorrect. The content connection is new and correct but the layout | ||
| // is still the same and was not propagated. | ||
| // | ||
| // zyga@wyzima:/run/snapd/ns$ sudo nsenter -mtest-snapd-content-layout.mnt | ||
| // root@wyzima:/# ls -l /usr/share/secureboot/potato | ||
| // total 1 | ||
| // -rw-rw-r-- 1 root root 22 Aug 30 09:36 canary.txt | ||
| // drwxrwxr-x 2 root root 32 Aug 30 09:36 meta | ||
| // root@wyzima:/# ls -l /snap/test-snapd-content-layout/x2/attached-content/ | ||
| // total 1 | ||
| // -rw-rw-r-- 1 root root 22 Aug 30 09:36 canary.txt | ||
| // drwxrwxr-x 2 root root 32 Aug 30 09:36 meta | ||
| // | ||
| // Yes, but: | ||
| // | ||
| // root@wyzima:/# cat /proc/self/mountinfo | grep attached | ||
| // 212 945 7:12 / /snap/test-snapd-content-layout/x2/attached-content ro,relatime master:34 - squashfs /dev/loop12 ro,errors=continue,threads=single | ||
| // | ||
| // root@wyzima:/# cat /proc/self/mountinfo | grep potato | ||
| // 572 598 7:12 / /usr/share/secureboot/potato ro,relatime master:34 - squashfs /dev/loop12 ro,errors=continue,threads=single | ||
| c.Assert(changes, DeepEquals, []*update.Change{ | ||
| {Action: "keep", Entry: current.Entries[3]}, | ||
| {Action: "keep", Entry: current.Entries[2]}, | ||
| {Action: "keep", Entry: current.Entries[1]}, | ||
| {Action: "keep", Entry: current.Entries[0]}, | ||
| {Action: "mount", Entry: desired.Entries[1]}, | ||
| }) | ||
|
|
||
| // The actual entry for clarity. | ||
| c.Assert(changes[4].Entry, DeepEquals, osutil.MountEntry{ | ||
| Name: "/snap/test-snapd-content/x1", | ||
| Dir: "/snap/test-snapd-content-layout/x2/attached-content", | ||
| Type: "none", | ||
| Options: []string{"bind", "ro"}, | ||
| }) | ||
| } | ||
|
|
||
| func (s *changeSuite) TestContentLayout4InitiallyDisconnectedThenConnected(c *C) { | ||
| current, err := osutil.LoadMountProfile("testdata/content-layout-4-initially-disconnected-then-connected.before.current.fstab") | ||
| c.Assert(err, IsNil) | ||
| desired, err := osutil.LoadMountProfile("testdata/content-layout-4-initially-disconnected-then-connected.desired.fstab") | ||
| c.Assert(err, IsNil) | ||
| changes := update.NeededChanges(current, desired) | ||
| showCurrentDesiredAndChanges(c, current, desired, changes) | ||
|
|
||
| c.Assert(changes, DeepEquals, []*update.Change{ | ||
| {Action: "keep", Entry: current.Entries[3]}, | ||
| {Action: "keep", Entry: current.Entries[2]}, | ||
| {Action: "keep", Entry: current.Entries[1]}, | ||
| {Action: "keep", Entry: current.Entries[0]}, | ||
| {Action: "mount", Entry: desired.Entries[1]}, | ||
| }) | ||
|
|
||
| // The actual entry for clarity. | ||
| c.Assert(changes[4].Entry, DeepEquals, osutil.MountEntry{ | ||
| Name: "/snap/test-snapd-content/x1", | ||
| Dir: "/snap/test-snapd-content-layout/x2/attached-content", | ||
| Type: "none", | ||
| Options: []string{"bind", "ro"}, | ||
| }) | ||
| } | ||
|
|
||
| func (s *changeSuite) TestContentLayout5InitiallyConnectedThenContentRefreshed(c *C) { | ||
| current, err := osutil.LoadMountProfile("testdata/content-layout-5-initially-connected-then-content-refreshed.before.current.fstab") | ||
| c.Assert(err, IsNil) | ||
| desired, err := osutil.LoadMountProfile("testdata/content-layout-5-initially-connected-then-content-refreshed.desired.fstab") | ||
| c.Assert(err, IsNil) | ||
| changes := update.NeededChanges(current, desired) | ||
| showCurrentDesiredAndChanges(c, current, desired, changes) | ||
|
|
||
| // This test shows similar behavior to -2- test - the layout stays propagated. | ||
| c.Assert(changes, DeepEquals, []*update.Change{ | ||
| {Action: "keep", Entry: current.Entries[4]}, | ||
| {Action: "keep", Entry: current.Entries[3]}, | ||
| {Action: "keep", Entry: current.Entries[2]}, | ||
| {Action: "unmount", Entry: withDetachOption(current.Entries[1])}, | ||
| {Action: "keep", Entry: current.Entries[0]}, | ||
| {Action: "mount", Entry: desired.Entries[1]}, | ||
| }) | ||
| } | ||
|
|
||
| func (s *changeSuite) TestContentLayout6InitiallyConnectedThenAppRefreshed(c *C) { | ||
| current, err := osutil.LoadMountProfile("testdata/content-layout-6-initially-connected-then-app-refreshed.before.current.fstab") | ||
| c.Assert(err, IsNil) | ||
| desired, err := osutil.LoadMountProfile("testdata/content-layout-6-initially-connected-then-app-refreshed.desired.fstab") | ||
| c.Assert(err, IsNil) | ||
| changes := update.NeededChanges(current, desired) | ||
| showCurrentDesiredAndChanges(c, current, desired, changes) | ||
|
|
||
| // In this case, because the attached content is mounted to $SNAP (and not $SNAP_COMMON), the path changes | ||
| // and both the layout and content are re-made. | ||
| c.Assert(changes, DeepEquals, []*update.Change{ | ||
| {Action: "unmount", Entry: withDetachOption(current.Entries[4])}, | ||
| {Action: "keep", Entry: current.Entries[3]}, | ||
| {Action: "keep", Entry: current.Entries[2]}, | ||
| {Action: "unmount", Entry: withDetachOption(current.Entries[1])}, | ||
| {Action: "keep", Entry: current.Entries[0]}, | ||
| // It is interesting to note that we first mount the content to $SNAP/attached-content | ||
| // and only then construct the layout from $SNAP/attached-content to /usr/share/secureboot/potato. | ||
| // This is correct but the ordering is fraigle. | ||
| {Action: "mount", Entry: desired.Entries[1]}, | ||
| {Action: "mount", Entry: desired.Entries[0]}, | ||
| }) | ||
| } | ||
|
|
||
| // withDetachOption returns a copy of the given mount entry with the x-snapd.detach option. | ||
| func withDetachOption(e osutil.MountEntry) osutil.MountEntry { | ||
| e.Options = append([]string{}, e.Options...) | ||
| e.Options = append(e.Options, "x-snapd.detach") | ||
| return e | ||
| } | ||
|
|
||
| func showCurrentDesiredAndChanges(c *C, current, desired *osutil.MountProfile, changes []*update.Change) { | ||
| c.Logf("Number of current entires: %d", len(current.Entries)) | ||
| for _, entry := range current.Entries { | ||
| c.Logf("- current : %v", entry) | ||
| } | ||
| c.Logf("Number of desired entires: %d", len(desired.Entries)) | ||
| for _, entry := range desired.Entries { | ||
| c.Logf("- desired: %v", entry) | ||
| } | ||
| c.Logf("Number of changes: %d", len(changes)) | ||
| for _, change := range changes { | ||
| c.Logf("- change: %v", change) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| # This makefiles uses grouped-target feature and relies on it for correctness. | ||
| ifeq (,$(findstring grouped-target,$(.FEATURES))) | ||
| $(error You need make with the grouped-taget feature to build this dataset) | ||
| endif | ||
|
|
||
| fstab_files = content-layout-1-initially-connected.current.fstab \ | ||
| content-layout-1-initially-connected.desired.fstab \ | ||
| content-layout-2-after-disconnect.desired.fstab \ | ||
| content-layout-2-after-disconnect.current.fstab \ | ||
| content-layout-3-after-reconnect.desired.fstab \ | ||
| content-layout-3-after-reconnect.current.fstab \ | ||
| content-layout-4-initially-disconnected-then-connected.before.current.fstab \ | ||
| content-layout-4-initially-disconnected-then-connected.desired.fstab \ | ||
| content-layout-4-initially-disconnected-then-connected.current.fstab \ | ||
| content-layout-5-initially-connected-then-content-refreshed.before.current.fstab \ | ||
| content-layout-5-initially-connected-then-content-refreshed.desired.fstab \ | ||
| content-layout-5-initially-connected-then-content-refreshed.current.fstab \ | ||
| content-layout-6-initially-connected-then-app-refreshed.before.current.fstab \ | ||
| content-layout-6-initially-connected-then-app-refreshed.desired.fstab \ | ||
| content-layout-6-initially-connected-then-app-refreshed.current.fstab | ||
|
|
||
| # None of the fstab files can be built in parallel as the depend on global system state. | ||
| .NOTPARALLEL: $(fstab_files) | ||
| .PHONY: all | ||
| all: $(fstab_files) | ||
|
|
||
| content-layout-1-initially-connected.desired.fstab content-layout-1-initially-connected.current.fstab &: test-snapd-content-layout_a_all.snap test-snapd-content_a_all.snap | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| sudo snap install --dangerous $(word 1,$^) | ||
| sudo snap install --dangerous $(word 1,$^) # Reinstall to get another revision for better clarity of the data. | ||
| sudo snap install --dangerous $(word 2,$^) | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| snap run test-snapd-content-layout.sh -c true | ||
| cp /var/lib/snapd/mount/snap.test-snapd-content-layout.fstab content-layout-1-initially-connected.desired.fstab | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-1-initially-connected.current.fstab | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| patch <annotations-1.patch | ||
|
|
||
| content-layout-2-after-disconnect.desired.fstab content-layout-2-after-disconnect.current.fstab &: test-snapd-content-layout_a_all.snap test-snapd-content_a_all.snap | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| sudo snap install --dangerous $(word 1,$^) | ||
| sudo snap install --dangerous $(word 1,$^) # Reinstall to get another revision for better clarity of the data. | ||
| sudo snap install --dangerous $(word 2,$^) | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| snap run test-snapd-content-layout.sh -c true | ||
| sudo snap disconnect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| cp /var/lib/snapd/mount/snap.test-snapd-content-layout.fstab content-layout-2-after-disconnect.desired.fstab | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-2-after-disconnect.current.fstab | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| patch <annotations-2.patch | ||
|
|
||
| content-layout-3-after-reconnect.desired.fstab content-layout-3-after-reconnect.current.fstab &: test-snapd-content-layout_a_all.snap test-snapd-content_a_all.snap | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| sudo snap install --dangerous $(word 1,$^) | ||
| sudo snap install --dangerous $(word 1,$^) # Reinstall to get another revision for better clarity of the data. | ||
| sudo snap install --dangerous $(word 2,$^) | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| snap run test-snapd-content-layout.sh -c true | ||
| sudo snap disconnect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| cp /var/lib/snapd/mount/snap.test-snapd-content-layout.fstab content-layout-3-after-reconnect.desired.fstab | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-3-after-reconnect.current.fstab | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| patch <annotations-3.patch | ||
|
|
||
| content-layout-4-initially-disconnected-then-connected.before.current.fstab content-layout-4-initially-disconnected-then-connected.desired.fstab content-layout-4-initially-disconnected-then-connected.current.fstab &: test-snapd-content-layout_a_all.snap test-snapd-content_a_all.snap | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| sudo snap install --dangerous $(word 1,$^) | ||
| sudo snap install --dangerous $(word 1,$^) # Reinstall to get another revision for better clarity of the data. | ||
| sudo snap install --dangerous $(word 2,$^) | ||
| snap connections test-snapd-content-layout | grep -xF 'content test-snapd-content-layout:just-content - -' | ||
| snap run test-snapd-content-layout.sh -c true | ||
| # This file is used by unit tests model the changes needed after the refresh below. | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-4-initially-disconnected-then-connected.before.current.fstab | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| cp /var/lib/snapd/mount/snap.test-snapd-content-layout.fstab content-layout-4-initially-disconnected-then-connected.desired.fstab | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-4-initially-disconnected-then-connected.current.fstab | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| patch <annotations-4.patch | ||
|
|
||
| content-layout-5-initially-connected-then-content-refreshed.before.current.fstab content-layout-5-initially-connected-then-content-refreshed.desired.fstab content-layout-5-initially-connected-then-content-refreshed.current.fstab &: test-snapd-content-layout_a_all.snap test-snapd-content_a_all.snap | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| sudo snap install --dangerous $(word 1,$^) | ||
| sudo snap install --dangerous $(word 1,$^) # Reinstall to get another revision for better clarity of the data. | ||
| sudo snap install --dangerous $(word 2,$^) | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| snap run test-snapd-content-layout.sh -c true | ||
| # This file is used by unit tests model the changes needed after the refresh below. | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-5-initially-connected-then-content-refreshed.before.current.fstab | ||
| sudo snap install --dangerous $(word 2,$^) # Refresh the content. | ||
| cp /var/lib/snapd/mount/snap.test-snapd-content-layout.fstab content-layout-5-initially-connected-then-content-refreshed.desired.fstab | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-5-initially-connected-then-content-refreshed.current.fstab | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| patch <annotations-5.patch | ||
|
|
||
| content-layout-6-initially-connected-then-app-refreshed.before.current.fstab content-layout-6-initially-connected-then-app-refreshed.desired.fstab content-layout-6-initially-connected-then-app-refreshed.current.fstab &: test-snapd-content-layout_a_all.snap test-snapd-content_a_all.snap | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| sudo snap install --dangerous $(word 1,$^) | ||
| sudo snap install --dangerous $(word 1,$^) # Reinstall to get another revision for better clarity of the data. | ||
| sudo snap install --dangerous $(word 2,$^) | ||
| sudo snap connect test-snapd-content-layout:just-content test-snapd-content:just-content | ||
| snap run test-snapd-content-layout.sh -c true | ||
| # This file is used by unit tests model the changes needed after the refresh below. | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-6-initially-connected-then-app-refreshed.before.current.fstab | ||
| sudo snap install --dangerous $(word 1,$^) # Refresh the app. | ||
| cp /var/lib/snapd/mount/snap.test-snapd-content-layout.fstab content-layout-6-initially-connected-then-app-refreshed.desired.fstab | ||
| cp /run/snapd/ns/snap.test-snapd-content-layout.fstab content-layout-6-initially-connected-then-app-refreshed.current.fstab | ||
| sudo snap remove --purge test-snapd-content-layout | ||
| sudo snap remove --purge test-snapd-content | ||
| patch <annotations-6.patch | ||
|
|
||
| test-snapd-content-layout_a_all.snap: test-snapd-content-layout | ||
| snap pack $< | ||
|
|
||
| test-snapd-content_a_all.snap: test-snapd-content | ||
| snap pack $< |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unused?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's useful for printing changes. It's not use here but really valuable in practice.