]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
saving uncommitted changes in /etc prior to emerge run
authorFrank Brehm <frank@brehm-online.com>
Thu, 16 Jun 2016 07:14:58 +0000 (09:14 +0200)
committerFrank Brehm <frank@brehm-online.com>
Thu, 16 Jun 2016 07:14:58 +0000 (09:14 +0200)
gdm/Xsession

index 3ed84dfb5df26fc88872871968787d110c2f0678..9878c96f7d74ac09a7a1323b2e500a1c1932e75b 100755 (executable)
@@ -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