From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 16 Jun 2016 07:14:58 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=04ee7c7c8e306a8a074cb4aed6553263fd6cde30;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/gdm/Xsession b/gdm/Xsession
index 3ed84dfb..9878c96f 100755
--- a/gdm/Xsession
+++ b/gdm/Xsession
@@ -148,13 +148,13 @@ unset XKB_IN_USE
 
 xhost +si:localuser:`id -un` || :
 
-if [ "x$command" = "xcustom" ] ; then
-  if [ -x "$HOME/.xsession" ]; then
-    command="$HOME/.xsession"
-  else
-    echo "$0: Cannot find ~/.xsession will try the default session"
-    command="default"
-  fi
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" -a ! -d "$i" ]; then
+	    . "$i"
+        fi
+    done
 fi
 
 if [ "x$command" = "xdefault" ] ; then
@@ -175,15 +175,6 @@ if [ "x$command" = "xdefault" ] ; then
   fi
 fi
 
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for i in /etc/X11/xinit/xinitrc.d/* ; do
-        if [ -x "$i" -a ! -d "$i" ]; then
-	    . "$i"
-        fi
-    done
-fi
-
 echo "$0: Setup done, will execute: $command"
 
 eval exec $command