summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-10-31 09:53:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-10-31 09:53:17 +0000
commitb58ce125d530b18d6c8fe735afacaf93758f25b5 (patch)
treeee120935827115fdfdedd45dda3bb447362918a5
parent1bae5490c7856772034d66d9c69977ddcb3a327b (diff)
downloaddrakx-b58ce125d530b18d6c8fe735afacaf93758f25b5.tar
drakx-b58ce125d530b18d6c8fe735afacaf93758f25b5.tar.gz
drakx-b58ce125d530b18d6c8fe735afacaf93758f25b5.tar.bz2
drakx-b58ce125d530b18d6c8fe735afacaf93758f25b5.tar.xz
drakx-b58ce125d530b18d6c8fe735afacaf93758f25b5.zip
cleanup Xfree server @options handling
-rw-r--r--perl-install/install_steps_gtk.pm25
1 files changed, 11 insertions, 14 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 419d29894..82e962140 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -41,25 +41,22 @@ sub new($$) {
}
my $launchX = sub {
my ($server, $Driver) = @_;
- $::move and goto configured_X;
-
- my $xpmac_opts = cat_('/proc/cmdline');
- install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver);
mkdir '/var/log' if !-d '/var/log';
- my @options = (
- if_(arch() !~ /^sparc/ && arch() ne 'ppc' && $server ne 'Xnest',
- '-kb', '-allowMouseOpenFail', '-xf86config', $f),
- ('tty7', '-dpms', '-s', '240'),
- );
+ my @options = $wanted_DISPLAY;
+ if ($server eq 'Xnest') {
+ push @options, '-ac', '-geometry', $o->{vga16} ? '640x480' : '800x600';
+ } elsif (!$::move) {
+ install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver);
- push @options, $xpmac_opts !~ /ofonly/ ? ('-mode', '17', '-depth', '32') : '-mach64' if $server =~ /Xpmac/;
- push @options, '-fp', '/usr/X11R6/lib/X11/fonts:unscaled' if $server =~ /Xsun|Xpmac/;
+ push @options, '-kb', '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/ && arch() ne 'ppc';
+ push @options, 'tty7', '-dpms', '-s', '240';
- configured_X:
- push @options, '-ac', '-geometry', $o->{vga16} ? '640x480' : '800x600' if $server eq 'Xnest';
- push @options, $wanted_DISPLAY;
+ #- old weird servers: Xpmac and Xsun
+ push @options, cat_('/proc/cmdline') !~ /ofonly/ ? ('-mode', '17', '-depth', '32') : '-mach64' if $server =~ /Xpmac/;
+ push @options, '-fp', '/usr/X11R6/lib/X11/fonts:unscaled' if $server =~ /Xsun|Xpmac/;
+ }
if (!fork()) {
c::setsid();