diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-06-20 00:20:31 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-06-20 00:20:31 +0900 |
| commit | f6318304eea92c5a918cd723708fd790fc5d2ecd (patch) | |
| tree | d677f43826235e53bc3866659e2e4a9502ab0d7f | |
| parent | cb618093d5a2156e6c5a03eaf8ca7d370bf33740 (diff) | |
hst: fix ephemeral overlay order
This is quite counterintuitive otherwise.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | hst/fsoverlay.go | 4 | ||||
| -rw-r--r-- | hst/fsoverlay_test.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hst/fsoverlay.go b/hst/fsoverlay.go index 16a5e335..f3c0f529 100644 --- a/hst/fsoverlay.go +++ b/hst/fsoverlay.go @@ -82,9 +82,9 @@ func (o *FSOverlay) Apply(z *ApplyState) { z.Overlay(o.Target, o.Upper, o.Work, o.Lower...) } else { z.OverlayEphemeral(o.Target, slices.Concat( + []*check.Absolute{o.Upper}, o.Lower, - []*check.Absolute{o.Upper})..., - ) + )...) } } else { z.OverlayReadonly(o.Target, o.Lower...) diff --git a/hst/fsoverlay_test.go b/hst/fsoverlay_test.go index e1ae21b5..ca4c1c64 100644 --- a/hst/fsoverlay_test.go +++ b/hst/fsoverlay_test.go @@ -70,7 +70,7 @@ func TestFSOverlay(t *testing.T) { Upper: m("/tmp/upper"), }, true, container.Ops{&container.MountOverlayOp{ Target: m("/"), - Lower: ms("/tmp/.src0", "/tmp/.src1", "/tmp/upper"), + Lower: ms("/tmp/upper", "/tmp/.src0", "/tmp/.src1"), Upper: fhs.AbsRoot, }}, m("/"), ms("/tmp/upper", "/tmp/.src0", "/tmp/.src1"), "e*/:/tmp/upper:/tmp/.src0:/tmp/.src1"}, |