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

run: Drop/Hide --no-desktop option 

This is no longer needed, as we don't hard-require systemd --user.
We keep the opion there, but hidden in order to be backwards compatible
with old code that used this.
tingping/wmclass
Alexander Larsson 2016-09-08 11:38:05 +02:00
parent 7f01e5113b
commit b53b78b2a2
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/flatpak-run.c
View File

@ -957,7 +957,7 @@ option_persist_cb (const gchar *option_name,
return TRUE;
}
static gboolean option_no_desktop;
static gboolean option_no_desktop_deprecated;
static GOptionEntry context_options[] = {
{ "share", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_share_cb, N_("Share with host"), N_("SHARE") },
@ -976,7 +976,8 @@ static GOptionEntry context_options[] = {
{ "system-own-name", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_system_own_name_cb, N_("Allow app to own name on the system bus"), N_("DBUS_NAME") },
{ "system-talk-name", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_system_talk_name_cb, N_("Allow app to talk to name on the system bus"), N_("DBUS_NAME") },
{ "persist", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, &option_persist_cb, N_("Persist home directory"), N_("FILENAME") },
{ "no-desktop", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &option_no_desktop, N_("Don't require a running session (no cgroups creation)"), NULL },
/* This is not needed/used anymore, so hidden, but we accept it for backwards compat */
{ "no-desktop", 0, G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &option_no_desktop_deprecated, N_("Don't require a running session (no cgroups creation)"), NULL },
{ NULL }
};

11
doc/flatpak-run.xml
View File

@ -313,17 +313,6 @@
</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>