first sparc release of DrakX.

1 files changed, 21 insertions, 2 deletions

diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index ce374c433..4ad02d116 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -181,7 +181,7 @@ sub new($$) {
 		my $ok = 1;
 		local $SIG{CHLD} = sub { $ok = 0 };
 		unless (fork) {
-		    exec $_[0], "-kb", "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1;
+		    exec $_[0], (arch() =~ /^sparc/ ? () : ("-kb")), "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1;
 		}
 		foreach (1..15) {
 		    sleep 1;
@@ -192,6 +192,7 @@ sub new($$) {
 	    };
 	    my @servers = qw(FBDev VGA16);
 	    @servers = qw(FBDev 3DLabs TGA) if arch() eq "alpha";
+	    @servers = qw(Mach64) if arch() =~ /^sparc/;
 
 	    foreach (@servers) {
 		log::l("Trying with server $_");
@@ -221,6 +222,8 @@ sub new($$) {
     install_theme($o);
     create_logo_window($o);
 
+#    eval { sleep 10; run_command::run('xhost+') }; #- for testing
+
     $my_gtk::force_center = [ $width - $windowwidth, $logoheight, $windowwidth, $windowheight ];
 
     (bless {}, ref $type || $type)->SUPER::new($o);
@@ -802,7 +805,7 @@ END
 
     local *F;
     open F, ">$file" or die "can't create X configuration file $file";
-    print F <<END;
+    print F <<END_KEYB;
 Section "Files"
    FontPath   "/usr/X11R6/lib/X11/fonts:unscaled,/usr/X11R6/lib/X11/fonts"
 EndSection
@@ -815,6 +818,22 @@ Section "Keyboard"
    RightAlt        Meta
    ScrollLock      Compose
    RightCtl        Control
+END_KEYB
+
+    if (arch() =~ /^sparc/) {
+	print F <<END_KEYB_SPARC;
+    XkbRules    "sun"
+    XkbModel    "sun"
+    XkbLayout   "us"
+    XkbCompat   "compat/complete"
+    XkbTypes    "types/complete"
+    XkbKeycodes "sun(type5)"
+    XkbGeometry "sun(type5)"
+    XkbSymbols  "sun/us(sun5)"
+END_KEYB_SPARC
+    }
+
+    print F <<END;
 EndSection
 
 Section "Pointer"