Skip to content
Snippets Groups Projects
Commit 8a4a5774 authored by Ludovico de Nittis's avatar Ludovico de Nittis :palm_tree:
Browse files

pressure-vessel: Mount resolved varlink socket if available

nss-resolve uses systemd-resolved to resolve hostnames and, since
systemd 247, it utilize the varlink API.

To make it run inside the container we need to expose the varlink
socket.

Check the upstream commit for more info
https://github.com/flatpak/flatpak/commit/e5da98ff4b12a080044d58b4cd2fb4edb4491132



Fixes: #61

Signed-off-by: default avatarLudovico de Nittis <ludovico.denittis@collabora.com>
parent 22e43459
No related branches found
No related tags found
1 merge request!257pressure-vessel: Mount resolved varlink socket if available
Pipeline #9710 passed
...@@ -42,6 +42,7 @@ void flatpak_run_add_x11_args (FlatpakBwrap *bwrap, ...@@ -42,6 +42,7 @@ void flatpak_run_add_x11_args (FlatpakBwrap *bwrap,
gboolean allowed); gboolean allowed);
gboolean flatpak_run_add_wayland_args (FlatpakBwrap *bwrap); gboolean flatpak_run_add_wayland_args (FlatpakBwrap *bwrap);
void flatpak_run_add_pulseaudio_args (FlatpakBwrap *bwrap); void flatpak_run_add_pulseaudio_args (FlatpakBwrap *bwrap);
void flatpak_run_add_resolved_args (FlatpakBwrap *bwrap);
gboolean flatpak_run_add_system_dbus_args (FlatpakBwrap *app_bwrap); gboolean flatpak_run_add_system_dbus_args (FlatpakBwrap *app_bwrap);
gboolean flatpak_run_add_session_dbus_args (FlatpakBwrap *app_bwrap); gboolean flatpak_run_add_session_dbus_args (FlatpakBwrap *app_bwrap);
void flatpak_run_apply_env_appid (FlatpakBwrap *bwrap, void flatpak_run_apply_env_appid (FlatpakBwrap *bwrap,
......
...@@ -727,8 +727,7 @@ flatpak_run_add_pulseaudio_args (FlatpakBwrap *bwrap) ...@@ -727,8 +727,7 @@ flatpak_run_add_pulseaudio_args (FlatpakBwrap *bwrap)
flatpak_bwrap_add_args (bwrap, "--dev-bind", "/dev/snd", "/dev/snd", NULL); flatpak_bwrap_add_args (bwrap, "--dev-bind", "/dev/snd", "/dev/snd", NULL);
} }
#if 0 void
static void
flatpak_run_add_resolved_args (FlatpakBwrap *bwrap) flatpak_run_add_resolved_args (FlatpakBwrap *bwrap)
{ {
const char *resolved_socket = "/run/systemd/resolve/io.systemd.Resolve"; const char *resolved_socket = "/run/systemd/resolve/io.systemd.Resolve";
...@@ -737,6 +736,7 @@ flatpak_run_add_resolved_args (FlatpakBwrap *bwrap) ...@@ -737,6 +736,7 @@ flatpak_run_add_resolved_args (FlatpakBwrap *bwrap)
flatpak_bwrap_add_args (bwrap, "--bind", resolved_socket, resolved_socket, NULL); flatpak_bwrap_add_args (bwrap, "--bind", resolved_socket, resolved_socket, NULL);
} }
#if 0
static void static void
flatpak_run_add_journal_args (FlatpakBwrap *bwrap) flatpak_run_add_journal_args (FlatpakBwrap *bwrap)
{ {
......
...@@ -57,6 +57,8 @@ pv_wrap_share_sockets (FlatpakBwrap *bwrap, ...@@ -57,6 +57,8 @@ pv_wrap_share_sockets (FlatpakBwrap *bwrap,
pv_environ_lock_env (container_env, "PULSE_SERVER", NULL); pv_environ_lock_env (container_env, "PULSE_SERVER", NULL);
pv_environ_lock_env (container_env, "XAUTHORITY", NULL); pv_environ_lock_env (container_env, "XAUTHORITY", NULL);
flatpak_run_add_resolved_args (sharing_bwrap);
flatpak_run_add_font_path_args (sharing_bwrap); flatpak_run_add_font_path_args (sharing_bwrap);
/* We need to set up IPC rendezvous points relatively late, so that /* We need to set up IPC rendezvous points relatively late, so that
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment