mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-18 05:38:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

session-helper: Add new more generic helper start method

Browse Source 
This does the same as RequestMonitor, but returns the status via a
a{sv} so that its more extensible.

Closes: #1757
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2018-06-04 16:45:18 +02:00
committed by Atomic Bot
parent c6ccf26eec
commit b4bb890516
3 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/flatpak-run.c
View File

@@ -1705,6 +1705,7 @@ add_monitor_path_args (gboolean use_session_helper,
{
g_autoptr(AutoFlatpakSessionHelper) session_helper = NULL;
g_autofree char *monitor_path = NULL;
g_autoptr(GVariant) session_data = NULL;
if (use_session_helper)
{
@@ -1717,17 +1718,18 @@ add_monitor_path_args (gboolean use_session_helper,
}
if (session_helper &&
flatpak_session_helper_call_request_monitor_sync (session_helper,
&monitor_path,
flatpak_session_helper_call_request_session_sync (session_helper,
&session_data,
NULL, NULL))
{
flatpak_bwrap_add_args (bwrap,
"--ro-bind", monitor_path, "/run/host/monitor",
"--symlink", "/run/host/monitor/localtime", "/etc/localtime",
"--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",
NULL);
if (g_variant_lookup (session_data, "path", "s", &monitor_path))
flatpak_bwrap_add_args (bwrap,
"--ro-bind", monitor_path, "/run/host/monitor",
"--symlink", "/run/host/monitor/localtime", "/etc/localtime",
"--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",
NULL);
}
else
{

4
data/org.freedesktop.Flatpak.xml
View File

@@ -30,6 +30,10 @@
<method name="RequestMonitor">
<arg type='ay' name='path' direction='out'/>
</method>
<method name="RequestSession">
<arg type='a{sv}' name='data' direction='out'/>
</method>
</interface>
<interface name='org.freedesktop.Flatpak.Development'>

32
session-helper/flatpak-session-helper.c
View File

@@ -59,6 +59,25 @@ handle_request_monitor (FlatpakSessionHelper *object,
return TRUE;
}
static gboolean
handle_request_session (FlatpakSessionHelper *object,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
GVariantBuilder builder;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_add (&builder, "{s@v}", "path",
g_variant_new_variant (g_variant_new_string (monitor_dir)));
flatpak_session_helper_complete_request_session (object, invocation,
g_variant_builder_end (&builder));
return TRUE;
}
static void
child_watch_died (GPid pid,
gint status,
@@ -363,6 +382,7 @@ on_bus_acquired (GDBusConnection *connection,
flatpak_session_helper_set_version (FLATPAK_SESSION_HELPER (helper), 1);
g_signal_connect (helper, "handle-request-monitor", G_CALLBACK (handle_request_monitor), NULL);
g_signal_connect (helper, "handle-request-session", G_CALLBACK (handle_request_session), NULL);
if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (helper),
connection,
@@ -579,6 +599,7 @@ main (int argc,
gboolean show_version;
GOptionContext *context;
GBusNameOwnerFlags flags;
g_autofree char *flatpak_dir = NULL;
g_autoptr(GError) error = NULL;
const GOptionEntry options[] = {
{ "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace old daemon.", NULL },
@@ -636,8 +657,15 @@ main (int argc,
return 1;
}
monitor_dir = g_build_filename (g_get_user_runtime_dir (), "flatpak-monitor", NULL);
if (g_mkdir_with_parents (monitor_dir, 0755) != 0)
flatpak_dir = g_build_filename (g_get_user_runtime_dir (), ".flatpak-helper", NULL);
if (g_mkdir_with_parents (flatpak_dir, 0700) != 0)
{
g_print ("Can't create %s\n", monitor_dir);
exit (1);
}
monitor_dir = g_build_filename (flatpak_dir, "monitor", NULL);
if (g_mkdir_with_parents (monitor_dir, 0700) != 0)
{
g_print ("Can't create %s\n", monitor_dir);
exit (1);