Fix language/keyboard layout and switchers

MSVSphere-9-Workstation.ks

@@ -3,11 +3,11 @@
 # X Window System configuration information
 xconfig  --startxonboot
 # Keyboard layouts
-keyboard 'ru'
+keyboard --vckeymap=ru --xlayouts='us','ru' --switch='grp:alt_shift_toggle','grp_led:scroll'
 # Root password
 rootpw --iscrypted --lock locked
 # System language (DO NOT CHANGE IF LIVEMEDIA-CREATOR IN USE)
-lang en_US.UTF-8
+lang en_US.UTF-8 --addsupport=ru_RU.UTF-8
 # Shutdown after installation
 shutdown
 # Network information
@@ -196,6 +196,17 @@ touch /.liveimg-configured
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
 echo "localhost-live" > /etc/hostname
 
+## add us,ru layouts by default
+cat > /usr/share/glib-2.0/schemas/org.gnome.desktop.input-sources.gschema.override << FOE
+[org.gnome.desktop.input-sources]
+sources=[('xkb', 'us'), ('xkb', 'ru')]
+mru-sources=[('xkb', 'us'), ('xkb', 'ru')]
+xkb-options=['grp:alt_shift_toggle', 'grp_led:scroll']
+FOE
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
 EOF
 
 # HAL likes to start late.
@@ -443,14 +454,6 @@ cat > /etc/locale.conf << FOE
 LANG="ru_RU.UTF-8"
 FOE
 
-# add us,ru layouts by default
-cat > /usr/share/glib-2.0/schemas/org.gnome.desktop.input-sources.gschema.override << FOE
-[org.gnome.desktop.input-sources]
-sources=[('xkb', 'us'), ('xkb', 'ru')]
-mru-sources=[('xkb', 'us'), ('xkb', 'ru')]
-xkb-options=['grp:alt_shift_toggle', 'grp_led:scroll']
-FOE
-
 cat > /usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.override << FOE
 [org.gnome.desktop.wm.preferences]
 button-layout='appmenu:minimize,maximize,close'