| author | X gate hg captive account <xhg@xserver.us.oracle.com> |
| Wed, 19 Aug 2015 13:48:41 -0700 | |
| changeset 1484 | bc8922b8e1d2 |
| parent 1370 | 7a7a374453e5 |
| permissions | -rw-r--r-- |
|
1179
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1094
diff
changeset
|
1 |
diff --git a/xinitrc.cpp b/xinitrc.cpp |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1094
diff
changeset
|
2 |
index 049a8e4..e60ff12 100644 |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1094
diff
changeset
|
3 |
--- a/xinitrc.cpp |
|
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1094
diff
changeset
|
4 |
+++ b/xinitrc.cpp |
|
1370
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1179
diff
changeset
|
5 |
@@ -39,6 +39,13 @@ if [ -f "$usermodmap" ]; then |
|
1094
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
6 |
XMODMAP "$usermodmap" |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
7 |
fi |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
8 |
|
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
9 |
+XCOMM |
|
1179
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1094
diff
changeset
|
10 |
+XCOMM If GNOME desktop is available, run it |
|
1094
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
11 |
+XCOMM |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
12 |
+if [ -x /etc/gdm/Xsession ] && [ -x /usr/bin/dtstart ] ; then |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
13 |
+ exec /etc/gdm/Xsession /usr/bin/dtstart jds |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
14 |
+fi |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
15 |
+ |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
16 |
XCOMM start some nice programs |
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
17 |
|
|
5f9b839fcbf7
7023672 The vncserver is unable to start a typical gnome Solaris 11 desktop, defaults to xterm
Stuart Kreitman <Stuart.Kreitman@Oracle.COM>
parents:
diff
changeset
|
18 |
#if defined(__SCO__) || defined(__UNIXWARE__) |