snap-confine: Support biarch Linux distribution confinement

[ikeydoherty]

This change enhances the biarch (i.e. non multiarch using multilib)
confinement to ensure the dominant architecture directories are recognised
for module mount locations and the "Arch" style (biarch.) of GL symlink
farm mounting will function correctly.

Signed-off-by: Ikey Doherty [email protected]

[zyga]

There are two changes here (more lib directory names and confined OpenGL symlink farm) but that is okay.

LGTM

[ikeydoherty]

TBH I'm trying to stop your build servers from crapping their pants running CI - and these two are so closely related it didn't seem to make sense to me to split them up

[zyga]

There's a trivial conflict to resolve @ikeydoherty

[ikeydoherty]

@zyga ya I know, a PR pushed after this one was merged, I'll have to redo it.

[codecov-io]

Codecov Report

Merging #3976 into master will increase coverage by 2.26%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3976      +/-   ##
==========================================
+ Coverage   75.88%   78.15%   +2.26%     
==========================================
  Files         431      436       +5     
  Lines       36913    40130    +3217     
==========================================
+ Hits        28012    31363    +3351     
+ Misses       6948     6753     -195     
- Partials     1953     2014      +61

Impacted Files	Coverage Δ
interfaces/builtin/all.go	77.77% <0%> (-22.23%)	⬇️
cmd/snap/cmd_prepare_image.go	39.13% <0%> (-2.98%)	⬇️
snap/info.go	85.75% <0%> (-2.54%)	⬇️
cmd/snap/cmd_download.go	5.47% <0%> (-0.78%)	⬇️
snap/snapenv/snapenv.go	96.42% <0%> (-0.68%)	⬇️
interfaces/core.go	96.61% <0%> (-0.66%)	⬇️
cmd/snap/cmd_buy.go	79.26% <0%> (-0.45%)	⬇️
overlord/hookstate/ctlcmd/stop.go	100% <0%> (ø)	⬆️
cmd/snap/cmd_shell.go	0% <0%> (ø)	⬆️
overlord/hookstate/ctlcmd/restart.go	100% <0%> (ø)	⬆️
... and 72 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1d4f12c...9a012dd. Read the comment docs.