diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-18 04:23:04 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-18 04:23:04 +0000 |
| commit | b47c58af1703e7d851e0d7b489a70bff15d5f28d (patch) | |
| tree | 4cc44ec7a82bdaca45a1368a58d57c16d2830867 /perl-install/install_steps_gtk.pm | |
| parent | 73dfbe7f701bf6efb3583efbe74be1b23cad4578 (diff) | |
| download | drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar.gz drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar.bz2 drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.tar.xz drakx-b47c58af1703e7d851e0d7b489a70bff15d5f28d.zip | |
merge globetrotter support from MDK-10-branch
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 6a1f7d064..6c97db1f8 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -45,10 +45,10 @@ sub new($$) { my @options = $wanted_DISPLAY; if ($server eq 'Xnest') { push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600'); - } elsif (!$::move) { + } elsif ($::globetrotter || !$::move) { install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver); - push @options, '-kb', '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/ && arch() ne 'ppc'; + push @options, if_(!$::globetrotter, '-kb'), '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/ && arch() ne 'ppc'; push @options, 'tty7', '-dpms', '-s', '240'; #- old weird servers: Xpmac and Xsun @@ -100,12 +100,12 @@ sub new($$) { @servers = qw(Xpmac); } - if ($::move && !$::testing) { + if (($::move || $::globetrotter) && !$::testing) { require move; require run_program; move::automatic_xconf($o); run_program::run('/sbin/service', 'xfs', 'start'); - @servers = qw(X_move); + @servers = $::globetrotter ? qw(Driver:fbdev) : qw(X_move); } foreach (@servers) { @@ -117,7 +117,7 @@ sub new($$) { install_any::getAndSaveFile("Mandrake/mdkinst$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!"; chmod 0755, "$dir/$prog"; } - if (/FB/) { + if (/FB/i) { !$o->{vga16} && $o->{allowFB} or next; $o->{allowFB} = &$launchX($prog, $Driver) #- keep in mind FB is used. |