e-smith-base/sme10/e-smith-base-5.8.0-LOCALE.patch

diff -up e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE     2014-03-23 22:47:24.000000000 -0400
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig    2016-04-12 03:17:54.640000000 -0400
@@ -1,5 +1,5 @@
 {
-    open F, "/etc/sysconfig/i18n";
+    open F, "/etc/locale.conf";
     my ($line) = grep(/^LANG/, <F>);
     close F;
 
@@ -8,19 +8,19 @@
     my $kbdtype = "pc";
     my $keytable = "us";
 
-    if (open F, "/etc/sysconfig/keyboard")
+    if (open F, "/etc/X11/xorg.conf.d/00-keyboard.conf")
     {
        my @lines = <F>;
        close F;
 
-       ($line) = grep(/^KEYBOARDTYPE/, @lines);
-       if ($line =~ /^KEYBOARDTYPE="(.*)"/)
-       {
-           $kbdtype = $1;
-       }
+       #($line) = grep(/^KEYBOARDTYPE/, @lines);
+       #if ($line =~ /^KEYBOARDTYPE="(.*)"/)
+       #{
+       #    $kbdtype = $1;
+       #}
 
-       ($line) = grep(/^KEYTABLE/, @lines);
-       if ($line =~ /^KEYTABLE="(.*)"/)
+       ($line) = grep(/^\s+Option "XkbLayout"/, @lines);
+       if ($line =~ /^\s+Option "XkbLayout"\s+"(.*)"/)
        {
            $keytable = $1;
        }
1	diff -up e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig
2	--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig.LOCALE 2014-03-23 22:47:24.000000000 -0400
3	+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/05sysconfig 2016-04-12 03:17:54.640000000 -0400
4	@@ -1,5 +1,5 @@
5	{
6	- open F, "/etc/sysconfig/i18n";
7	+ open F, "/etc/locale.conf";
8	my ($line) = grep(/^LANG/, <F>);
9	close F;
10
11	@@ -8,19 +8,19 @@
12	my $kbdtype = "pc";
13	my $keytable = "us";
14
15	- if (open F, "/etc/sysconfig/keyboard")
16	+ if (open F, "/etc/X11/xorg.conf.d/00-keyboard.conf")
17	{
18	my @lines = <F>;
19	close F;
20
21	- ($line) = grep(/^KEYBOARDTYPE/, @lines);
22	- if ($line =~ /^KEYBOARDTYPE="(.*)"/)
23	- {
24	- $kbdtype = $1;
25	- }
26	+ #($line) = grep(/^KEYBOARDTYPE/, @lines);
27	+ #if ($line =~ /^KEYBOARDTYPE="(.*)"/)
28	+ #{
29	+ # $kbdtype = $1;
30	+ #}
31
32	- ($line) = grep(/^KEYTABLE/, @lines);
33	- if ($line =~ /^KEYTABLE="(.*)"/)
34	+ ($line) = grep(/^\s+Option "XkbLayout"/, @lines);
35	+ if ($line =~ /^\s+Option "XkbLayout"\s+"(.*)"/)
36	{
37	$keytable = $1;
38	}