diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-08-24 21:33:17 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-08-24 21:33:17 +0000 |
| commit | cec029e4e802c3f73a426c13144edd7d58a96b4a (patch) | |
| tree | dce42e35fc7d8bae731bbfc16b8a39cbc23de31e /perl-install/install | |
| parent | 41a734bc6e663894da6983cc2f0bf7ef3a98a4a7 (diff) | |
| download | drakx-backup-do-not-use-cec029e4e802c3f73a426c13144edd7d58a96b4a.tar drakx-backup-do-not-use-cec029e4e802c3f73a426c13144edd7d58a96b4a.tar.gz drakx-backup-do-not-use-cec029e4e802c3f73a426c13144edd7d58a96b4a.tar.bz2 drakx-backup-do-not-use-cec029e4e802c3f73a426c13144edd7d58a96b4a.tar.xz drakx-backup-do-not-use-cec029e4e802c3f73a426c13144edd7d58a96b4a.zip | |
drop globetrotter support (unused for quite a long time and superceeded by Mdv One)
we should just drop Mdv Move code btw...
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 8 |
4 files changed, 6 insertions, 8 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 22ef0eb18..6d21e6c23 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -262,7 +262,7 @@ sub createXconf { symlink("/tmp/stage2/etc/X11", "/etc/X11"); if ($Driver) { - output($file, sprintf(<<'END', ($::globetrotter ? "" : 'Option "XkbDisable"'), $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); + output($file, sprintf(<<'END', 'Option "XkbDisable"', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"')); Section "Files" FontPath "/usr/share/fonts:unscaled" EndSection diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index dbd75a8f2..93c0029eb 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -378,7 +378,6 @@ sub main { nomouseprobe => sub { $o->{nomouseprobe} = $v }, updatemodules => sub { $o->{updatemodules} = 1 }, move => sub { $::move = 1 }, - globetrotter => sub { $::move = 1; $::globetrotter = 1 }, suppl => sub { $o->{supplmedia} = 1 }, askmedia => sub { $o->{askmedia} = 1 }, }}{lc $n}; &$f if $f; @@ -582,7 +581,7 @@ sub main { } $::o = $o = $o_; - eval { output('/proc/splash', "verbose\n") } if !$::globetrotter; + eval { output('/proc/splash', "verbose\n") }; #-the main cycle MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep($o)) { diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 53e86f5b0..9b3d086a7 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -139,7 +139,6 @@ sub bestKernelPackage { my @preferred_exts = $::o->{match_all_hardware} ? (arch() =~ /x86_64/ ? '-desktop' : '-desktop586') : - $::build_globetrotter ? '-desktop' : detect_devices::is_xbox() ? '-xbox' : detect_devices::is_i586() ? '-desktop586' : detect_devices::isLaptop() ? '-laptop' : diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 4c56d012b..7f71a359e 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -47,10 +47,10 @@ sub new($$) { my @options = $wanted_DISPLAY; if ($server eq 'Xnest') { push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600'); - } elsif ($::globetrotter || !$::move) { + } elsif (!$::move) { install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver); - push @options, if_(!$::globetrotter, '-kb'), '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/; + push @options, '-kb', '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/; push @options, 'tty7', '-s', '240'; #- old weird servers: Xsun @@ -106,11 +106,11 @@ sub new($$) { @servers = map { if_($_, "Driver:$_") } $card && $card->{Driver}, 'fbdev'; } - if (($::move || $::globetrotter) && !$::testing) { + if ($::move && !$::testing) { require move; require run_program; move::automatic_xconf($o); - @servers = $::globetrotter ? qw(Driver:fbdev) : qw(X_move); + @servers = qw(X_move); } foreach (@servers) { |