mirror of
https://github.com/token2/snapd.git
synced 2026-03-13 11:15:47 -07:00
08820c3340
* cmd/snap-update-ns: apply content mounts before layouts Tweak how mounts coming form content and layouts are ordered. Specifically make sure that entries coming from content mounts are applied before ones from the layouts (x-snapd.origin=layout). Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * cmd/snap-update-ns: fix unit tests for hosts without /usr/local/share/fonts Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * cmd/snap-update-ns: tweak debug logging Tweak debug logging, slightly verbose, but quite useful. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * tests: add spread test for mount order regression * cmd/snap-update-ns: only sort the desired profile entries Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * cmd/snap-update-ns: update unit tests Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * tests: address review comments * tests: use core18 as base core20 does not work because /lib is a symbolic link. * tests: use bind-file when binding a single file * tests/main/layout-symlink-bind-revert: update to show the new behavior Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * cmd/snap-updates-ns: small cleanups * cmd/snap-update-ns: be more conservative with the reused entries code do the sorting before finding reused entries the same way as before * cmd/snap-update-ns: renamed *MagicDir to *MountPoint * tests/main/layout-symlink-bind-revert: do not run the test on 14.04 As it's missing nsenter. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * tests: fix shellcheck issues * tests/regression/lp-1844496: verify files at both locations The test did not verify that the file at the other location exists too. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> * cmd/snap-update-ns: add a more realistic mount ordering unit test Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> Co-authored-by: Alberto Mardegan <mardy@users.sourceforge.net> Co-authored-by: Samuele Pedroni <pedronis@lucediurna.net>