Skip to content

Commit 0edbd3d

Browse files
committed
Remove GNOME session support
1 parent 04f3c7c commit 0edbd3d

File tree

3 files changed

+24
-31
lines changed

3 files changed

+24
-31
lines changed

usr/src/cmd/slim-install/svc/live-sysidtool-system

+22-24
Original file line numberDiff line numberDiff line change
@@ -45,30 +45,28 @@ then
4545
cd /.cdrom/jack
4646
find . -print | cpio -pmud /jack
4747

48-
if [ -x /usr/bin/mate-session ]; then
49-
# Switch to Mate by default if it's present
50-
printf '[Desktop]\n' > /jack/.dmrc
51-
printf 'Session=mate\n' >> /jack/.dmrc
52-
53-
# Set language
54-
RC_LANG="en_US.UTF-8"
55-
if [ -f /etc/sysconfig/language ]; then
56-
. /etc/sysconfig/language
57-
fi
58-
printf 'Language=%s\n' "${RC_LANG}" >> /jack/.dmrc
59-
60-
# Set keyboard layout
61-
layout=${RC_LANG:0:2}
62-
if [ "$layout" != "en" -a "$layout" != "C" ]; then
63-
DCONF_CONFIG=/etc/dconf/db/local.d/98-xkb-settings
64-
65-
printf "[org/mate/desktop/peripherals/keyboard/kbd]\n" > $DCONF_CONFIG
66-
printf "layouts=['us','%s']\n" "$layout" >> $DCONF_CONFIG
67-
printf "options=['grp\\\tgrp:alt_shift_toggle']\n" >> $DCONF_CONFIG
68-
printf "model='pc105'\n" >> $DCONF_CONFIG
69-
70-
dconf update
71-
fi
48+
# Construct user .dmrc file
49+
printf '[Desktop]\n' > /jack/.dmrc
50+
printf 'Session=mate\n' >> /jack/.dmrc
51+
52+
# Set language
53+
RC_LANG="en_US.UTF-8"
54+
if [ -f /etc/sysconfig/language ]; then
55+
. /etc/sysconfig/language
56+
fi
57+
printf 'Language=%s\n' "${RC_LANG}" >> /jack/.dmrc
58+
59+
# Set keyboard layout
60+
layout=${RC_LANG:0:2}
61+
if [ "$layout" != "en" -a "$layout" != "C" ]; then
62+
DCONF_CONFIG=/etc/dconf/db/local.d/98-xkb-settings
63+
64+
printf "[org/mate/desktop/peripherals/keyboard/kbd]\n" > $DCONF_CONFIG
65+
printf "layouts=['us','%s']\n" "$layout" >> $DCONF_CONFIG
66+
printf "options=['grp\\\tgrp:alt_shift_toggle']\n" >> $DCONF_CONFIG
67+
printf "model='pc105'\n" >> $DCONF_CONFIG
68+
69+
dconf update
7270
fi
7371

7472
#

usr/src/cmd/slim-install/user/jack/Xclients

+1-6
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,4 @@
2323
# Use is subject to license terms.
2424
#
2525
# For automatic login, we just invoke the default Gnome desktop
26-
if [ -x /usr/bin/mate-session ]; then
27-
exec /usr/bin/dtstart mate ;
28-
else
29-
exec /usr/bin/dtstart gnome ;
30-
fi
31-
26+
exec /usr/bin/dtstart mate
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[Desktop]
2-
Session=gnome
2+
Session=mate
33
Language=en_US.UTF-8

0 commit comments

Comments
 (0)