brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell-util: Only use systemd if gnome-shell is managed by systemd

Browse Source 
Simply looking at the return value of sd_pid_get_user_unit can be used
to determine if the process is in a systemd unit, but it doesn't say if
gnome-shell is managed by systemd.

For example, running toolbx on a host with systemd creates a libpod
unit, even if the gnome-shell that gets started in the toolbx is itself
not managed by systemd.

We can make sure that gnome-shell is managed by systemd simply by
checking if the unit we're running starts with org.gnome.Shell.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3267>
This commit is contained in:
Sebastian Wick 2024-04-16 16:29:48 +02:00 committed by Marge Bot
parent 3b7028ea7f
commit b3580919e3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shell-util.c
View File

@ -635,7 +635,8 @@ shell_util_systemd_call (const char *command,
*/
res = sd_pid_get_user_unit (getpid (), &self_unit);
if (res == -ENODATA)
if (res == -ENODATA ||
(res >= 0 && !g_str_has_prefix (self_unit, "org.gnome.Shell")))
{
g_task_return_new_error (task,
G_IO_ERROR,