app/seal: leave $DISPLAY as is on host abstract
All checks were successful
Test / Create distribution (push) Successful in 26s
Test / Hakurei (push) Successful in 42s
Test / Hakurei (race detector) (push) Successful in 42s
Test / Sandbox (race detector) (push) Successful in 40s
Test / Sandbox (push) Successful in 40s
Test / Hpkg (push) Successful in 40s
Test / Flake checks (push) Successful in 1m24s
All checks were successful
Test / Create distribution (push) Successful in 26s
Test / Hakurei (push) Successful in 42s
Test / Hakurei (race detector) (push) Successful in 42s
Test / Sandbox (race detector) (push) Successful in 40s
Test / Sandbox (push) Successful in 40s
Test / Hpkg (push) Successful in 40s
Test / Flake checks (push) Successful in 1m24s
This helps work around faulty software that misinterprets unix: DISPLAY string. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
9d932d1039
commit
acb6931f3e
@ -418,9 +418,11 @@ func (seal *outcome) finalise(ctx context.Context, sys sys.State, config *hst.Co
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
seal.sys.UpdatePermType(system.EX11, socketPath.String(), acl.Read, acl.Write, acl.Execute)
|
seal.sys.UpdatePermType(system.EX11, socketPath.String(), acl.Read, acl.Write, acl.Execute)
|
||||||
|
if !config.Container.HostAbstract {
|
||||||
d = "unix:" + socketPath.String()
|
d = "unix:" + socketPath.String()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
seal.sys.ChangeHosts("#" + seal.user.uid.String())
|
seal.sys.ChangeHosts("#" + seal.user.uid.String())
|
||||||
seal.env[display] = d
|
seal.env[display] = d
|
||||||
|
@ -49,6 +49,7 @@ let
|
|||||||
mapRealUid
|
mapRealUid
|
||||||
useCommonPaths
|
useCommonPaths
|
||||||
userns
|
userns
|
||||||
|
hostAbstract
|
||||||
;
|
;
|
||||||
enablements = {
|
enablements = {
|
||||||
inherit (tc) x11;
|
inherit (tc) x11;
|
||||||
|
@ -26,6 +26,7 @@ in
|
|||||||
useCommonPaths = true;
|
useCommonPaths = true;
|
||||||
userns = false;
|
userns = false;
|
||||||
x11 = true;
|
x11 = true;
|
||||||
|
hostAbstract = false;
|
||||||
|
|
||||||
# 0, PresetStrict
|
# 0, PresetStrict
|
||||||
expectedFilter = {
|
expectedFilter = {
|
||||||
|
@ -35,6 +35,7 @@ in
|
|||||||
useCommonPaths = true;
|
useCommonPaths = true;
|
||||||
userns = false;
|
userns = false;
|
||||||
x11 = false;
|
x11 = false;
|
||||||
|
hostAbstract = false;
|
||||||
|
|
||||||
# 0, PresetStrict
|
# 0, PresetStrict
|
||||||
expectedFilter = {
|
expectedFilter = {
|
||||||
|
@ -35,6 +35,7 @@ in
|
|||||||
useCommonPaths = false;
|
useCommonPaths = false;
|
||||||
userns = true;
|
userns = true;
|
||||||
x11 = false;
|
x11 = false;
|
||||||
|
hostAbstract = false;
|
||||||
|
|
||||||
# 0, PresetExt | PresetDenyDevel
|
# 0, PresetExt | PresetDenyDevel
|
||||||
expectedFilter = {
|
expectedFilter = {
|
||||||
|
@ -35,6 +35,7 @@ in
|
|||||||
useCommonPaths = false;
|
useCommonPaths = false;
|
||||||
userns = false;
|
userns = false;
|
||||||
x11 = false;
|
x11 = false;
|
||||||
|
hostAbstract = false;
|
||||||
|
|
||||||
# 0, PresetStrict
|
# 0, PresetStrict
|
||||||
expectedFilter = {
|
expectedFilter = {
|
||||||
|
@ -35,6 +35,7 @@ in
|
|||||||
useCommonPaths = true;
|
useCommonPaths = true;
|
||||||
userns = false;
|
userns = false;
|
||||||
x11 = true;
|
x11 = true;
|
||||||
|
hostAbstract = true;
|
||||||
|
|
||||||
# 0, PresetExt | PresetDenyNS | PresetDenyDevel
|
# 0, PresetExt | PresetDenyNS | PresetDenyDevel
|
||||||
expectedFilter = {
|
expectedFilter = {
|
||||||
@ -45,7 +46,7 @@ in
|
|||||||
want = {
|
want = {
|
||||||
env = [
|
env = [
|
||||||
"DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/65534/bus"
|
"DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/65534/bus"
|
||||||
"DISPLAY=unix:/tmp/.X11-unix/X0"
|
"DISPLAY=:0"
|
||||||
"HOME=/var/lib/hakurei/u0/a2"
|
"HOME=/var/lib/hakurei/u0/a2"
|
||||||
"PULSE_SERVER=unix:/run/user/65534/pulse/native"
|
"PULSE_SERVER=unix:/run/user/65534/pulse/native"
|
||||||
"SHELL=/run/current-system/sw/bin/bash"
|
"SHELL=/run/current-system/sw/bin/bash"
|
||||||
@ -276,7 +277,7 @@ in
|
|||||||
seccomp = true;
|
seccomp = true;
|
||||||
|
|
||||||
try_socket = "/tmp/.X11-unix/X0";
|
try_socket = "/tmp/.X11-unix/X0";
|
||||||
socket_abstract = false;
|
socket_abstract = true;
|
||||||
socket_pathname = true;
|
socket_pathname = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user