hst: fix ephemeral overlay order
Test / Create distribution (push) Successful in 1m0s
Test / Sandbox (push) Successful in 2m55s
Test / ShareFS (push) Successful in 4m13s
Test / Hakurei (push) Successful in 4m19s
Test / Sandbox (race detector) (push) Successful in 5m58s
Test / Hakurei (race detector) (push) Successful in 6m53s
Test / Flake checks (push) Successful in 1m11s
Test / Create distribution (push) Successful in 1m0s
Test / Sandbox (push) Successful in 2m55s
Test / ShareFS (push) Successful in 4m13s
Test / Hakurei (push) Successful in 4m19s
Test / Sandbox (race detector) (push) Successful in 5m58s
Test / Hakurei (race detector) (push) Successful in 6m53s
Test / Flake checks (push) Successful in 1m11s
This is quite counterintuitive otherwise. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
+2
-2
@@ -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...)
|
||||
|
||||
@@ -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"},
|
||||
|
||||
Reference in New Issue
Block a user