summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrey Vihrov <andrey.vihrov@gmail.com>2019-05-08 16:36:25 +0200
committerRomain Bouvier <skunnyk@alteroot.org>2019-05-08 17:19:36 +0200
commit5befa329c66dcf77e11a76191a43ab3630fa7d34 (patch)
treed5fd6f018882296e26894834cb5feece3ff31d24 /scripts
parenta7a413a6f3644d052a504a6a0e286f28053920b1 (diff)
downloadxfce4-session-5befa329c66dcf77e11a76191a43ab3630fa7d34.tar.gz
Use exec to launch xfce4-session from xinitrc
- Xfce's xinitrc launches xfce4-session as a simple command. - This means that the shell process executing xinitrc will stay running and wait for xfce4-session to complete, even though it has nothing more to do. - Fix bug #11964
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/xinitrc.in.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index e4930987..6562a117 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -82,7 +82,7 @@ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
# required for starting from a console, not a login manager
if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then
if command -v ck-launch-session >/dev/null 2>&1; then
- ck-launch-session xfce4-session
+ exec ck-launch-session xfce4-session
else
echo
echo "You have tried to start Xfce with consolekit support, but"
@@ -93,7 +93,7 @@ if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then
fi
else
# start xfce4-session normally
- xfce4-session
+ exec xfce4-session
fi
# if we got here, then exec failed