summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Deziel <simon@sdeziel.info>2023-02-22 19:05:17 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2023-02-22 19:05:17 +0900
commita140924e437346ebb7cd30c6e4d316ab5d447871 (patch)
treee13bfbca464fee477952ef0dd96648b83a390f75
parentbc065f8ced797186dd5a6c2460eea6efe755b16d (diff)
downloadibus-a140924e437346ebb7cd30c6e4d316ab5d447871.tar.gz
src/services: use a shell exec in systemd service files
exec sub-command avoids keeping the parent shell around. Refer sh(1) Fedora sh is bash. BUG=https://github.com/ibus/ibus/pull/2453
-rw-r--r--bus/services/org.freedesktop.IBus.session.GNOME.service.in2
-rw-r--r--bus/services/org.freedesktop.IBus.session.generic.service.in3
2 files changed, 2 insertions, 3 deletions
diff --git a/bus/services/org.freedesktop.IBus.session.GNOME.service.in b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
index 7f718e3c..858cf10d 100644
--- a/bus/services/org.freedesktop.IBus.session.GNOME.service.in
+++ b/bus/services/org.freedesktop.IBus.session.GNOME.service.in
@@ -18,7 +18,7 @@ Conflicts=gnome-session@gnome-login.target
[Service]
Type=dbus
# Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland
-ExecStart=sh -c '@bindir@/ibus-daemon --panel disable $([ "$XDG_SESSION_TYPE" = "x11" ] && echo "--xim")'
+ExecStart=sh -c 'exec @bindir@/ibus-daemon --panel disable $([ "$XDG_SESSION_TYPE" = "x11" ] && echo "--xim")'
Restart=on-abnormal
BusName=org.freedesktop.IBus
TimeoutStopSec=5
diff --git a/bus/services/org.freedesktop.IBus.session.generic.service.in b/bus/services/org.freedesktop.IBus.session.generic.service.in
index 9d493159..e7b7ce4f 100644
--- a/bus/services/org.freedesktop.IBus.session.generic.service.in
+++ b/bus/services/org.freedesktop.IBus.session.generic.service.in
@@ -7,8 +7,7 @@ Conflicts=gnome-session-initialized.target
[Service]
Type=dbus
-# Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland
-ExecStart=sh -c '@bindir@/ibus-daemon $IBUS_DAEMON_ARGS'
+ExecStart=sh -c 'exec @bindir@/ibus-daemon $IBUS_DAEMON_ARGS'
Restart=on-abnormal
BusName=org.freedesktop.IBus
TimeoutStopSec=5