diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-15 16:23:56 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-15 16:23:56 +0000 |
| commit | 6a24ca4166aae4c0b79528286925f46cfeb15c7f (patch) | |
| tree | 2b436969ad910f65842975a485990ae2a5036ec9 | |
| parent | 05352defbc710b2c804a69cae27adecb466ad2f6 (diff) | |
| download | drakx-6a24ca4166aae4c0b79528286925f46cfeb15c7f.tar drakx-6a24ca4166aae4c0b79528286925f46cfeb15c7f.tar.gz drakx-6a24ca4166aae4c0b79528286925f46cfeb15c7f.tar.bz2 drakx-6a24ca4166aae4c0b79528286925f46cfeb15c7f.tar.xz drakx-6a24ca4166aae4c0b79528286925f46cfeb15c7f.zip | |
support for globettroter's first time wizard
| -rw-r--r-- | perl-install/do_pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 8 |
3 files changed, 6 insertions, 5 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 ca4e3631a..6a95c964b 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -412,6 +412,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_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 68082c61b..bea50d03c 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -45,7 +45,7 @@ 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'; @@ -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. |