summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgasinvein <gasinvein@gmail.com>2021-09-17 12:06:27 +0300
committerAlexander Larsson <alexander.larsson@gmail.com>2021-09-23 09:58:27 +0200
commit9962b6bc1ac31112fab0be3f0670b8466b5c1ec5 (patch)
tree5f4045f96995c5a8d8a2ad1dc0bb8cbd2821ad7e
parent38c03dff324d0a5bd5872c609ee7afd5a0c3cbd2 (diff)
downloadflatpak-9962b6bc1ac31112fab0be3f0670b8466b5c1ec5.tar.gz
run: Get gai.conf from session helper
-rw-r--r--common/flatpak-run.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 5570efb3..e93b3d63 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -2741,6 +2741,7 @@ add_monitor_path_args (gboolean use_session_helper,
"--symlink", "/run/host/monitor/resolv.conf", "/etc/resolv.conf",
"--symlink", "/run/host/monitor/host.conf", "/etc/host.conf",
"--symlink", "/run/host/monitor/hosts", "/etc/hosts",
+ "--symlink", "/run/host/monitor/gai.conf", "/etc/gai.conf",
NULL);
if (g_variant_lookup (session_data, "pkcs11-socket", "s", &pkcs11_socket_path))
@@ -2776,6 +2777,10 @@ add_monitor_path_args (gboolean use_session_helper,
flatpak_bwrap_add_args (bwrap,
"--ro-bind", "/etc/hosts", "/etc/hosts",
NULL);
+ if (g_file_test ("/etc/gai.conf", G_FILE_TEST_EXISTS))
+ flatpak_bwrap_add_args (bwrap,
+ "--ro-bind", "/etc/gai.conf", "/etc/gai.conf",
+ NULL);
}
}
@@ -3248,6 +3253,7 @@ flatpak_run_setup_base_argv (FlatpakBwrap *bwrap,
strcmp (dent->d_name, "resolv.conf") == 0 ||
strcmp (dent->d_name, "host.conf") == 0 ||
strcmp (dent->d_name, "hosts") == 0 ||
+ strcmp (dent->d_name, "gai.conf") == 0 ||
strcmp (dent->d_name, "localtime") == 0 ||
strcmp (dent->d_name, "timezone") == 0 ||
strcmp (dent->d_name, "pkcs11") == 0)