diff options
| -rw-r--r-- | perl-install/do_pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_gtk.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm index 11cb4e84b..eff29a3dc 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -57,7 +57,7 @@ sub new { sub install { my ($do, @l) = @_; log::l("do_pkgs_during_install::install"); - if ($::testing) { + if ($::testing || $::globetrotter) { log::l("i would install packages " . join(' ', @l)); return 1; } else { diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 39bd34847..392a25df9 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -414,6 +414,7 @@ sub main { nomouseprobe => sub { $o->{nomouseprobe} = $v }, updatemodules => sub { $o->{updatemodules} = 1 }, move => sub { $::move = 1 }, + globetrotter => sub { $::move = 1; $::globetrotter = 1 }, }}{lc $n}; &$f if $f; } %cmdline; diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index c7086f915..dd5faef65 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -256,8 +256,7 @@ sub createXconf { symlink("/tmp/stage2/etc/X11", "/etc/X11"); if ($Driver) { - output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); - + output($file, sprintf(<<'END', ($::globetrotter ? "" : 'Option "XkbDisable"'), $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); Section "Files" FontPath "/usr/X11R6/lib/X11/fonts:unscaled" EndSection @@ -265,7 +264,7 @@ EndSection Section "InputDevice" Identifier "Keyboard" Driver "Keyboard" - Option "XkbDisable" + %s Option "XkbModel" "pc105" Option "XkbLayout" "" EndSection 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. |