This commit was manufactured by cvs2svn to create taghelium_sparc_rc1

'helium_sparc_rc1'.

3 files changed, 29 insertions, 44 deletions

diff --git a/make_boot_img b/make_boot_img
index d69715afc..14dde54b1 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -203,6 +203,10 @@ image[sun4c,sun4d,sun4m]=/$boot/vmlinux
   label=ks
   initrd=/$boot/live.rdz
   append=\"ramdisk_size=32000 ks$corporate\"
+image[sun4c,sun4d,sun4m]=/$boot/vmlinux
+  label=rescue
+  initrd=/$boot/live.rdz
+  append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\"
 image[sun4u]=/$boot/vmlinux64
   label=linux
   alias=install
@@ -220,6 +224,10 @@ image[sun4u]=/$boot/vmlinux64
   label=ks
   initrd=/$boot/live64.rdz
   append=\"ramdisk_size=32000 ks$corporate\"
+image[sun4u]=/$boot/vmlinux64
+  label=rescue
+  initrd=/$boot/live64.rdz
+  append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\"
 ");
 
 	output("$dir/$boot/README", "
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 894adf130..db4c09297 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -24,9 +24,7 @@ my %lang2keyboard =
 (
   'af' => 'us_intl',
   'be' => 'by',
-  'be_BY.CP1251' => 'by',
   'bg' => 'bg',
-'bg_BG'=> 'bg',
   'br' => 'fr',
   'ca' => 'es',
   'cs' => 'cz',
@@ -75,7 +73,6 @@ my %lang2keyboard =
 'pt_BR'=> 'br',
 'pt_PT'=> 'pt',
   'ru' => 'ru',
-  'ru_RU.KOI8-R' => 'ru',
   'sk' => 'sk',
   'sl' => 'si',
   'sr' => 'yu',
@@ -83,7 +80,6 @@ my %lang2keyboard =
   'th' => 'th',
   'tr' => 'tr_q',
   'uk' => 'ua',
-'uk_UA' => 'ua',
   'wa' => 'be',
 );
 
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index f37f8389e..601e6c463 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -17,13 +17,13 @@ use log;
 #- [2] = value for $LANG, [3] = value for LANGUAGE (a list of possible
 #- languages, carefully choosen)
 my %languages = (
-'en_US'  => [ 'English (US)',		'iso-8859-1', 'en', 'en_US:en' ],
+  'en'  => [ 'English (US)',		'iso-8859-1', 'en', 'en_US:en' ],
 'en_GB' => [ 'English (UK)',		'iso-8859-1', 'en', 'en_GB:en' ],
   'af'  => [ 'Afrikaans',		'iso-8859-1', 'af', 'af:en_ZA' ],
   'ar'  => [ 'Arabic',			'iso-8859-6', 'ar', 'ar' ],
-'be_BY.CP1251' => [ 'Belarussian',	'cp1251',     'be', 'be:be_BY.CP1251' ],
+  'be'  => [ 'Belarussian',		'cp1251',     'be', 'be:be_BY.CP1251' ],
 #- provide aliases for some not very standard names used in po files...
-'bg_BG' => [ 'Bulgarian',		'cp1251',     'bg', 'bg:bg.CP1251:bg_BG.CP1251' ],
+  'bg'  => [ 'Bulgarian',		'cp1251',     'bg', 'bg:bg.CP1251:bg_BG.CP1251' ],
   'br'  => [ 'Brezhoneg',		'iso-8859-1', 'br', 'br:fr_FR:fr' ],
   'ca'  => [ 'Catalan',			'iso-8859-1', 'ca', 'ca:es_ES:es:fr_FR:fr' ],
   'cs'  => [ 'Czech',			'iso-8859-2', 'cs', 'cs' ],
@@ -34,12 +34,12 @@ my %languages = (
   'el'  => [ 'Greek',                   'iso-8859-7', 'el', 'el' ],
   'eo'  => [ 'Esperanto',		'iso-8859-3', 'eo', 'eo' ],
 'es_AR' => [ 'Spanish (Argentina)',	'iso-8859-1', 'es', 'es_AR:es_UY:es:es_ES' ],
-'es_ES' => [ 'Spanish (Spain, modern sorting)',	'iso-8859-1', 'es', 'es_ES:es' ],
+'es_ES' => [ 'Spanish (Spain, modern sorting)',	'iso-8859-1', 'es', 'es' ],
 'es@tradicional' => [ 'Spanish (Spain, traditional sorting)', 'iso-8859-1', 'es', 'es' ],
 'es_MX' => [ 'Spanish (Mexico)',	'iso-8859-1', 'es', 'es_MX:es:es_ES' ],
   'et'  => [ 'Estonian',		'iso-8859-15','et', 'et' ],
   'eu'  => [ 'Euskara (Basque)',	'iso-8859-1', 'eu', 'eu:es_ES:fr_FR:es:fr' ],
-  'fa'  => [ 'Farsi (Iranian)',		'isiri-3342', 'fa', 'fa' ],
+#-'fa'  => [ 'Farsi (Iranian)',		'isiri-3342', 'fa', 'fa' ],
   'fi'  => [ 'Suomi (Finnish)',		'iso-8859-15', 'fi', 'fi' ],
 #-'fo'  => [ 'Faroese',			'iso-8859-1', 'fo', 'fo:??:??' ],
 'fr_CA' => [ 'French (Canada)',		'iso-8859-1', 'fr', 'fr_CA:fr' ],
@@ -79,7 +79,7 @@ my %languages = (
 'pt_BR' => [ 'Portuguese (Brazil)',	'iso-8859-1', 'pt_BR', 'pt_BR:pt_PT:pt' ],
 'pt_PT' => [ 'Portuguese (Portugal)',	'iso-8859-1', 'pt', 'pt_PT:pt:pt_BR' ],
   'ro'  => [ 'Romanian',  		'iso-8859-2', 'ro', 'ro' ],
-'ru_RU.KOI8-R' => [ 'Russian', 		'koi8-r',     'ru', 'ru_RU.KOI8-R:ru' ],
+  'ru'  => [ 'Russian',   		'koi8-r',     'ru', 'ru' ],
   'sk'  => [ 'Slovak',    		'iso-8859-2', 'sk', 'sk' ],
   'sl'  => [ 'Slovenian',		'iso-8859-2', 'sl', 'sl' ],
   'sp'  => [ 'Serbian (Cyrillic)',	'iso-8859-5', 'sp', 'sp:sr' ],
@@ -87,7 +87,7 @@ my %languages = (
   'sv'  => [ 'Swedish',			'iso-8859-1', 'sv', 'sv' ],
   'th'  => [ 'Thai',                    'tis620',     'th', 'th' ],
   'tr'  => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
-'uk_UA' => [ 'Ukrainian', 		'koi8-u',     'uk', 'uk_UA:uk' ],
+  'uk'  => [ 'Ukrainian', 		'koi8-u',     'uk', 'uk' ],
   'vi'  => [ 'Vietnamese (TCVN)',       'tcvn',       'vi',
 					'vi_VN.tcvn:vi_VN.tcvn-5712:vi' ],
 'vi_VN.viscii' => [ 'Vietnamese (VISCII)','viscii',   'vi',
@@ -170,11 +170,11 @@ my %charsets = (
 #- japanese needs special console driver for text mode [kon2]
   "jisx0208"   => [ undef,		undef,		"trivial.trans",
 	"-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
-  "koi8-r"     => [ "UniCyr_8x16",	undef,		"koi8-r",
+  "koi8-r"     => [ "koi8-8x16",	"koi8-r",	"trivial.trans",
 	std("koi8-r") ],
-  "koi8-u"     => [ "UniCyr_8x16",	undef,		"koi8-u",
+  "koi8-u"     => [ "koi8u_8x16",	"koi8-r",	"trivial.trans",
 	std("koi8-u") ],
-  "cp1251"     => [ "UniCyr_8x16",	undef,		"cp1251",
+  "cp1251"     => [ "iso05.f16",	"iso05",	"iso05_to_cp1251.trans",
 	std("microsoft-cp1251") ],
 #- Yiddish needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
@@ -266,37 +266,18 @@ sub write {
 	add2hash $h, { LANG => $l->[2], LANGUAGE => $l->[3], RPM_INSTALL_LANG => $l->[3] };
 
 	my $c = $charsets{$l->[1] || ''};
-	if ($c) {
-	    my $p = "$prefix/usr/lib/kbd";
-	    add2hash $h, { CHARSET => $c };
-	    if ($c->[0]) {
-		add2hash $h, { SYSFONT => $c->[0] };
-		eval {
-		    commands::cp("-f",
-			"$p/consolefonts/$c->[0].psf.gz",
-			"$prefix/etc/sysconfig/console");
-		};
-		$@ and log::l("missing console font $c->[0]");
-	    }
-	    if ($c->[1]) {
-		add2hash $h, { UNIMAP => $c->[1] };
-		eval {
-		    commands::cp("-f",
-			glob_("$p/consoletrans/$c->[1]*"),
-			"$prefix/etc/sysconfig/console");
-		};
-		$@ and log::l("missing console unimap file $c->[1]");
-	    }
-	    if ($c->[2]) {
-		add2hash $h, { SYSFONTACM => $c->[2] };
-		eval {
-		    commands::cp("-f",
-			glob_("$p/consoletrans/$c->[2]*"),
-			"$prefix/etc/sysconfig/console");
-		};
-		$@ and log::l("missing console acm file $c->[2]");
-	    }
+	if ($c && $c->[0] && $c->[1]) {	    
+	    add2hash $h, { SYSFONT => $c->[0], UNIMAP => $c->[1], SYSFONTACM => $c->[2] };
 
+	    my $p = "$prefix/usr/lib/kbd";
+	    eval {
+		commands::cp("-f",
+		     "$p/consolefonts/$c->[0].psf.gz",
+		     glob_("$p/consoletrans/$c->[1]*"),
+		     glob_("$p/consoletrans/$c->[2]*"),
+		     "$prefix/etc/sysconfig/console");
+	    };
+	    $@ and log::l("missing console $c->[0], $c->[1], $c->[2]");
 	}
 	add2hash $h, $xim{$lang};
     }