[Xfce4-commits] [xfce/xfce4-session] 04/05: Use exec to launch xfce4-session from xinitrc

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-session.

commit 5befa329c66dcf77e11a76191a43ab3630fa7d34
Author: Andrey Vihrov <andrey.vihrov at gmail.com>
Date:   Wed May 8 16:36:25 2019 +0200

    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
---
 scripts/xinitrc.in.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index e493098..6562a11 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.