Skip to content
Snippets Groups Projects
Commit b377cafb authored by Simon McVittie's avatar Simon McVittie
Browse files

pv-wrap: Only bind-mount systemd-resolved socket if using a runtime

If we're not using a runtime, then all of /run/systemd is shared between
host and container anyway. Mounting a socket over the top of an existing
socket fails with "No such device or address" due to a bubblewrap bug
(fixed in <https://github.com/containers/bubblewrap/pull/409

>).

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent a6f5b505
No related branches found
No related tags found
1 merge request!265pv-wrap: Only bind-mount systemd-resolved socket if using a runtime
Pipeline #10088 passed
......@@ -57,8 +57,6 @@ pv_wrap_share_sockets (FlatpakBwrap *bwrap,
pv_environ_lock_env (container_env, "PULSE_SERVER", NULL);
pv_environ_lock_env (container_env, "XAUTHORITY", NULL);
flatpak_run_add_resolved_args (sharing_bwrap);
flatpak_run_add_font_path_args (sharing_bwrap);
/* We need to set up IPC rendezvous points relatively late, so that
......@@ -87,6 +85,7 @@ pv_wrap_share_sockets (FlatpakBwrap *bwrap,
flatpak_run_add_pulseaudio_args (sharing_bwrap);
flatpak_run_add_session_dbus_args (sharing_bwrap);
flatpak_run_add_system_dbus_args (sharing_bwrap);
flatpak_run_add_resolved_args (sharing_bwrap);
}
envp = pv_bwrap_steal_envp (sharing_bwrap);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment