diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-16 13:18:31 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-16 13:18:31 +0000 |
| commit | 4679ec8bf83ef95a1b1e3f3c61dd21ceaab315ce (patch) | |
| tree | 28974a4161d8a464d59781d76ebe52f98a8bc210 /perl-install/install_steps_gtk.pm | |
| parent | 70800fea4199313a755c9dda383941f30c3a572a (diff) | |
| download | drakx-4679ec8bf83ef95a1b1e3f3c61dd21ceaab315ce.tar drakx-4679ec8bf83ef95a1b1e3f3c61dd21ceaab315ce.tar.gz drakx-4679ec8bf83ef95a1b1e3f3c61dd21ceaab315ce.tar.bz2 drakx-4679ec8bf83ef95a1b1e3f3c61dd21ceaab315ce.tar.xz drakx-4679ec8bf83ef95a1b1e3f3c61dd21ceaab315ce.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 2169b8bb4..483936295 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -54,6 +54,7 @@ sub new($$) { my $f = "/tmp/Xconf"; createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{wacom}); + devices::make("/dev/kbd"); if ($ENV{DISPLAY} eq ":0") { my $launchX = sub { @@ -88,9 +89,10 @@ sub new($$) { foreach (@servers) { log::l("Trying with server $_"); + sleep 3; my $dir = "/usr/X11R6/bin"; my $prog = /Xsun/ ? $_ : "XF86_$_"; - unless (-x "$dir/XF86_$_") { + unless (-x "$dir/$prog") { unlink $_ foreach glob_("$dir/X*"); install_any::getAndSaveFile("$dir/$prog", "$dir/$prog") or die "failed to get server: $!"; chmod 0755, "$dir/$prog"; @@ -822,7 +824,7 @@ sub init_sizes() { sub createXconf { my ($file, $mouse_type, $mouse_dev, $wacom_dev) = @_; - devices::make("/dev/kdb") if arch() =~ /^sparc/; #- used by Xsun style server. + devices::make("/dev/kbd") if arch() =~ /^sparc/; #- used by Xsun style server. symlinkf($mouse_dev, "/dev/mouse"); #- needed for imlib to start on 8-bit depth visual. @@ -944,6 +946,9 @@ Section "Screen" EndSubsection EndSection +END + if (arch() =~ /^sparc/) { + print F <<END_FBDEV_SPARC; Section "Screen" Driver "svga" Device "svga" @@ -954,7 +959,9 @@ Section "Screen" ViewPort 0 0 EndSubsection EndSection - +END_FBDEV_SPARC + } else { + print F <<END_FBDEV; Section "Screen" Driver "accel" Device "svga" @@ -965,8 +972,8 @@ Section "Screen" ViewPort 0 0 EndSubsection EndSection -END - +END_FBDEV + } } #- ModeLine "640x480" 28 640 672 768 800 480 490 492 525 #-###################################################################################### |