[or-cvs] r11392: Improve keymap selection for full, don't ask on boot, use KD (in incognito/trunk: . arch/x86 arch/x86/overlay/isolinux root_overlay/var/lib/kdesession)

[double at seul.org]

Author: double
Date: 2007-09-06 14:08:44 -0400 (Thu, 06 Sep 2007)
New Revision: 11392

Added:
   incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc
Modified:
   incognito/trunk/ChangeLog
   incognito/trunk/arch/x86/livecd-stage1.spec
   incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
Log:
Improve keymap selection for full, don't ask on boot, use KDE keymap selector.


Modified: incognito/trunk/ChangeLog
===================================================================
--- incognito/trunk/ChangeLog	2007-09-06 18:04:58 UTC (rev 11391)
+++ incognito/trunk/ChangeLog	2007-09-06 18:08:44 UTC (rev 11392)
@@ -21,6 +21,8 @@
 	firmware to fail.
 	- Added proxy config for links web browser.
 	- Fix title when opening existing TrueCrypt volume.
+	- Improve keymap handling. Remove keymap selection on full since the
+	language selection will do this. Use KDE built-in keymap selector.
 
 
 

Modified: incognito/trunk/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec	2007-09-06 18:04:58 UTC (rev 11391)
+++ incognito/trunk/arch/x86/livecd-stage1.spec	2007-09-06 18:08:44 UTC (rev 11392)
@@ -239,7 +239,6 @@
 	kde-base/kommander
 	kde-base/kpdf
 	kde-base/kde-i18n
-	kde-misc/kkbswitch
 	app-admin/keepassx
 	net-analyzer/knetscan
 	net-p2p/ktorrent

Modified: incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
===================================================================
--- incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg	2007-09-06 18:04:58 UTC (rev 11391)
+++ incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg	2007-09-06 18:08:44 UTC (rev 11392)
@@ -18,46 +18,46 @@
 label gentoo-zh
   menu label Chinese
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=zh keymap=zh
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=zh keymap=zh
 
 label gentoo-en
   menu label English
   menu default
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet
 
 label gentoo-fa
   menu label Farsi
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=fa keymap=fa
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=fa keymap=fa
 
 label gentoo-fr
   menu label French
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=fr keymap=fr
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=fr keymap=fr
 
 label gentoo-de
   menu label German
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=de keymap=de
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=de keymap=de
 
 label gentoo-it
   menu label Italian
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=it keymap=it
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=it keymap=it
 
 label gentoo-ja
   menu label Japanese
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=ja keymap=ja
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=ja keymap=ja
 
 label gentoo-pt
   menu label Portuguese
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=pt keymap=pt
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=pt keymap=pt
 
 label gentoo-es
   menu label Spanish
   kernel gentoo
-  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot dokeymap initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=es keymap=es
+  append root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot initrd=gentoo.igz vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet lang=es keymap=es
 

Added: incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/kdesession/kxkbrc	2007-09-06 18:08:44 UTC (rev 11392)
@@ -0,0 +1,14 @@
+[Layout]
+DisplayNames=
+EnableXkbOptions=false
+IncludeGroups=
+LayoutList=us,de,es,fr,it,jp,pt
+Model=pc104
+Options=
+ResetOldOptions=false
+ShowFlag=true
+ShowSingle=false
+StickySwitching=false
+StickySwitchingDepth=2
+SwitchMode=Global
+Use=true