diff options
| -rw-r--r-- | perl-install/any.pm | 14 | ||||
| -rw-r--r-- | perl-install/do_pkgs.pm | 2 | ||||
| -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 |
6 files changed, 12 insertions, 18 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index b330d731a..54ef4694d 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -816,11 +816,11 @@ sub autologin { my @wm = sessions(); my @users = map { $_->{name} } @{$o->{users} || []}; - if (!$::globetrotter && member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') { + if (member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') { $o->{desktop} = 'KDE'; $o->{autologin} = $users[0]; - } elsif ($::globetrotter || @wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) { - my $use_autologin = $::globetrotter || @users == 1; + } elsif (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) { + my $use_autologin = @users == 1; $in->ask_from_( { title => N("Autologin"), @@ -861,21 +861,17 @@ sub acceptLicense { cancel => N("Quit"), messages => formatAlaTeX(messages::main_license() . "\n\n\n" . messages::warning_about_patents()), interactive_help_id => 'acceptLicense', - if_(!$::globetrotter && $o->{release_notes}, more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ]), + if_($o->{release_notes}, more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ]), callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, }, [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]) or do { # when refusing license in finish-install: exec("/sbin/reboot") if !$::isInstall; - if ($::globetrotter) { - run_program::run('killall', 'Xorg'); - exec("/sbin/reboot"); - } else { + install::media::umount_phys_medium($o->{stage2_phys_medium}); install::media::openCdromTray($o->{stage2_phys_medium}{device}) if !detect_devices::is_xbox() && $o->{method} eq 'cdrom'; $o->exit; - } }; } diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm index 4ea4d812c..a77d43c11 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -126,7 +126,7 @@ sub in { sub install { my ($do, @l) = @_; log::l("do_pkgs_during_install::install"); - if ($::testing || $::globetrotter) { + if ($::testing) { log::l("i would install packages " . join(' ', @l)); 1; } else { 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) { |