marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #171 from mariospr/no-desktop 

flatpak-run: Add a new --no-desktop option to prevent creation of cgroups
tingping/wmclass
Alexander Larsson 2016-07-02 00:05:30 +02:00 committed by GitHub
parent 51663de427 8c8b91609c
commit 92ab585e6f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/flatpak-run.c
View File

@ -845,6 +845,8 @@ option_persist_cb (const gchar *option_name,
return TRUE;
}
static gboolean option_no_desktop;
static GOptionEntry context_options[] = {
{ "share", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_share_cb, "Share with host", "SHARE" },
{ "unshare", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_unshare_cb, "Unshare with host", "SHARE" },
@ -860,6 +862,7 @@ static GOptionEntry context_options[] = {
{ "system-own-name", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_system_own_name_cb, "Allow app to own name on the system bus", "DBUS_NAME" },
{ "system-talk-name", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_system_talk_name_cb, "Allow app to talk to name on the system bus", "DBUS_NAME" },
{ "persist", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_persist_cb, "Persist home directory directory", "FILENAME" },
{ "no-desktop", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &option_no_desktop, "Don't require a running session (no cgroups creation)", NULL },
{ NULL }
};
@ -3166,7 +3169,7 @@ flatpak_run_app (const char *app_ref,
/* Must run this before spawning the dbus proxy, to ensure it
ends up in the app cgroup */
if (!flatpak_run_in_transient_unit (app_ref_parts[1], error))
if (!option_no_desktop && !flatpak_run_in_transient_unit (app_ref_parts[1], error))
return FALSE;
if (!add_dbus_proxy_args (argv_array, session_bus_proxy_argv, (flags & FLATPAK_RUN_FLAG_LOG_SESSION_BUS) != 0, sync_fds, error))

11
doc/flatpak-run.xml
View File

@ -291,6 +291,17 @@
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--no-desktop</option></term>
<listitem><para>
Don't require a running session, meaning that no cgroups creation will happen. This can be
useful for certain scenarios when you might want to run a flatpak without a valid user
session available (e.g. from a socket-activated systemd service), and not having a
properly sandboxed environment is not an issue.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--log-session-bus</option></term>