mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-21 06:08:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #148 from matthiasclasen/journal

Browse Source 
make journal logging work in the sandbox
This commit is contained in:
Alexander Larsson
2016-06-27 11:14:11 +02:00
committed by GitHub
parent 5f73b1f2da f6af5702db
commit 43dbf96f7c
5 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/flatpak-run.c
View File

@@ -72,6 +72,7 @@ typedef enum {
FLATPAK_CONTEXT_SOCKET_PULSEAUDIO = 1 << 2,
FLATPAK_CONTEXT_SOCKET_SESSION_BUS = 1 << 3,
FLATPAK_CONTEXT_SOCKET_SYSTEM_BUS = 1 << 4,
FLATPAK_CONTEXT_SOCKET_JOURNAL = 1 << 5,
} FlatpakContextSockets;
/* Same order as enum */
@@ -81,6 +82,7 @@ const char *flatpak_context_sockets[] = {
"pulseaudio",
"session-bus",
"system-bus",
"journal",
NULL
};
@@ -1531,6 +1533,27 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array,
}
}
static void
flatpak_run_add_journal_args (GPtrArray *argv_array,
char ***envp_p)
{
const char *journal_socket_socket = g_strdup ("/run/systemd/journal/socket");
const char *journal_stdout_socket = g_strdup ("/run/systemd/journal/stdout");
if (g_file_test (journal_socket_socket, G_FILE_TEST_EXISTS))
{
add_args (argv_array,
"--bind", journal_socket_socket, journal_socket_socket,
NULL);
}
if (g_file_test (journal_stdout_socket, G_FILE_TEST_EXISTS))
{
add_args (argv_array,
"--bind", journal_stdout_socket, journal_stdout_socket,
NULL);
}
}
static char *
create_proxy_socket (char *template)
{
@@ -1974,6 +1997,12 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
flatpak_run_add_pulseaudio_args (argv_array, fd_array, envp_p);
}
if (context->sockets & FLATPAK_CONTEXT_SOCKET_JOURNAL)
{
g_debug ("Allowing journal access");
flatpak_run_add_journal_args (argv_array, envp_p);
}
unrestricted_session_bus = (context->sockets & FLATPAK_CONTEXT_SOCKET_SESSION_BUS) != 0;
if (unrestricted_session_bus)
g_debug ("Allowing session-dbus access");

4
doc/flatpak-build-finish.xml
View File

@@ -114,7 +114,7 @@
<listitem><para>
Expose a well known socket to the application. This updates
the [Context] group in the metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>
@@ -125,7 +125,7 @@
<listitem><para>
Don't expose a well known socket to the application. This updates
the [Context] group in the metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>

4
doc/flatpak-build.xml
View File

@@ -139,7 +139,7 @@
<listitem><para>
Expose a well-known socket to the application. This overrides to
the Context section from the application metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>
@@ -150,7 +150,7 @@
<listitem><para>
Don't expose a well-known socket to the application. This overrides to
the Context section from the application metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>

4
doc/flatpak-override.xml
View File

@@ -95,7 +95,7 @@
<listitem><para>
Expose a well-known socket to the application. This overrides to
the Context section from the application metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>
@@ -106,7 +106,7 @@
<listitem><para>
Don't expose a well-known socket to the application. This overrides to
the Context section from the application metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>

4
doc/flatpak-run.xml
View File

@@ -173,7 +173,7 @@
<listitem><para>
Expose a well known socket to the application. This overrides to
the Context section from the application metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>
@@ -184,7 +184,7 @@
<listitem><para>
Don't expose a well known socket to the application. This overrides to
the Context section from the application metadata.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus.
SOCKET must be one of: x11, wayland, pulseaudio, system-bus, session-bus, journal.
This option can be used multiple times.
</para></listitem>
</varlistentry>