Attachment 8604 Details for Bug 18199 – patch for xinitrc's Xsession to get sddm working with gnome-classic (alternate version)

[patch] patch for xinitrc's Xsession to get sddm working with gnome-classic (alternate version)

Xsession_alternate.diff (text/plain), 1014 bytes, created by Giuseppe Ghibò on 2016-10-27 01:12:51 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2016-10-27 01:12:51 CEST

Size: 1014 bytes

patch

obsolete

>--- Xsession.orig	2016-08-30 13:02:18.000000000 +0200
>+++ Xsession
>@@ -12,6 +12,9 @@
> # default values
> 
> DESKTOP=default
>+ARGS="$@"
>+NARGS=$#
>+LAST="${@:$#}"
> 
> # read the user (~/.i18n) or system-wide (/etc/sysconfig/i18n) i18n settings
> . /etc/profile.d/10lang.sh
>@@ -109,6 +112,11 @@
>     fi
> done
> 
>+if [ $DESKTOP = "default" -a "$(basename ${DESKTOP_SESSION})" = "gnome-classic" ]; then
>+	DESKTOP=GNOMEClassic
>+	SESSION=$DESKTOP
>+fi
>+
> if [ -n "$DESKTOP" ]; then
>     case $DESKTOP in
>     	failsafe)
>@@ -146,6 +154,15 @@
> 	exec /bin/sh -c "$HOME/.Xclients"
> fi
> 
>+# if we are still here we heuristically assume that the arguments
>+# passed to Xsession represents the command to be executed for running the desktop.
>+# ideally we assume the last argument is the session name
>+if [ "$NARGS" -ge 2 -a "$DESKTOP" = "default" ]; then
>+	FALLBACK_EXEC="$ARGS"
>+	SESSION="$LAST"
>+	exec /bin/sh -c "${FALLBACK_EXEC}"
>+fi
>+
> # We may try with chksession
> if [ -x /usr/sbin/chksession ];then
> #get the first available

--- Xsession.orig	2016-08-30 13:02:18.000000000 +0200
+++ Xsession
@@ -12,6 +12,9 @@
 # default values
 
 DESKTOP=default
+ARGS="$@"
+NARGS=$#
+LAST="${@:$#}"
 
 # read the user (~/.i18n) or system-wide (/etc/sysconfig/i18n) i18n settings
 . /etc/profile.d/10lang.sh
@@ -109,6 +112,11 @@
     fi
 done
 
+if [ $DESKTOP = "default" -a "$(basename ${DESKTOP_SESSION})" = "gnome-classic" ]; then
+	DESKTOP=GNOMEClassic
+	SESSION=$DESKTOP
+fi
+
 if [ -n "$DESKTOP" ]; then
     case $DESKTOP in
     	failsafe)
@@ -146,6 +154,15 @@
 	exec /bin/sh -c "$HOME/.Xclients"
 fi
 
+# if we are still here we heuristically assume that the arguments
+# passed to Xsession represents the command to be executed for running the desktop.
+# ideally we assume the last argument is the session name
+if [ "$NARGS" -ge 2 -a "$DESKTOP" = "default" ]; then
+	FALLBACK_EXEC="$ARGS"
+	SESSION="$LAST"
+	exec /bin/sh -c "${FALLBACK_EXEC}"
+fi
+
 # We may try with chksession
 if [ -x /usr/sbin/chksession ];then
 #get the first available

Actions: View | Diff

Attachments on bug 18199: 8299 | 8300 | 8603 | 8604