diff options
| -rw-r--r-- | perl-install/ChangeLog | 11 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 5 | ||||
| -rw-r--r-- | perl-install/Xconfigurator_consts.pm | 4 | ||||
| -rw-r--r-- | perl-install/install2.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 7 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 1 | ||||
| -rw-r--r-- | perl-install/share/compssList | 7 | ||||
| -rwxr-xr-x | perl-install/standalone/drakboot | 12 |
11 files changed, 41 insertions, 19 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 7e9189cf8..4e1c2c866 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,16 @@ 2000-05-02 Pixel <pixel@mandrakesoft.com> + * Xconfigurator_consts.pm: Rage128 and 3dfx are not available any + more + + * install_steps_interactive.pm (setup_thiskind): make insmod'ing + fail a simple warning. + + * Xconfigurator.pm (readMonitorsDB): adapt to new MonitorsDB + * share/MonitorsDB: take new one from RedHat + + * standalone/drakboot: added kfloppy + * g_auto_install: add $dir/lib to LD_LIBRARY_PATH (it was silly not to have it) diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 016344aef..ce37bdacf 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -101,7 +101,7 @@ sub readMonitorsDB { /^#/ and next; /^$/ and next; - my @fields = qw(type bandwidth hsyncrange vsyncrange); + my @fields = qw(vendor type eisa hsyncrange vsyncrange); my @l = split /\s*;\s*/; @l == @fields or log::l("bad line $lineno ($_)"), next; @@ -110,7 +110,7 @@ sub readMonitorsDB { my $i; for ($i = 0; $monitors{"$l{type} ($i)"}; $i++) {} $l{type} = "$l{type} ($i)"; } - $monitors{$l{type}} = \%l; + $monitors{"$l{vendor}|$l{type}"} = \%l; } while (my ($k, $v) = each %standard_monitors) { $monitors{_("Generic") . "|" . translate($k)} = @@ -298,6 +298,7 @@ sub testFinalConfig($;$$) { #- needed for bad cards not restoring cleanly framebuffer my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/; + $bad_card ||= $o->{card}{identifier} eq "ATI|3D Rage P/M Mobility AGP 2x"; log::l("the graphic card does not like X in framebuffer") if $bad_card; my $mesg = _("Do you want to test the configuration?"); diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm index e1005b3b1..6a3eb49ff 100644 --- a/perl-install/Xconfigurator_consts.pm +++ b/perl-install/Xconfigurator_consts.pm @@ -23,8 +23,8 @@ use common qw(:common); 'FBDev' => "fbdev", ) : ( 'SVGA' => "svga", - 'Rage128' => "svga", - '3dfx' => "svga", +#- 'Rage128' => "svga", +#- '3dfx' => "svga", 'S3' => "accel", 'Mach32' => "accel", 'Mach8' => "accel", diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 8e684a2aa..d8bd61b9c 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -555,6 +555,7 @@ sub main { }}{lc $n}; &$f if $f; } %cmdline; + undef $::auto_install if $cfg; if ($::g_auto_install) { (my $root = `/bin/pwd`) =~ s|(/[^/]*){5}$||; symlinkf $root, "/tmp/rhimage" or die "unable to create link /tmp/rhimage"; @@ -622,6 +623,8 @@ sub main { #- needed very early for install_steps_gtk eval { ($o->{mouse}, $o->{wacom}) = mouse::detect() } unless $o->{nomouseprobe} || $o->{mouse}; + lang::set($o->{lang}) if $o->{lang} ne 'en'; #- mainly for defcfg + $o->{allowFB} = listlength(cat_("/proc/fb")); my $o_; diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 371969337..7f88ead98 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -270,7 +270,7 @@ sub setPackages($) { my @l = (); push @l, "kapm" if $o->{pcmcia}; require pci_probing::main; - push @l, "Device3Dfx", "Glide_V3" if pci_probing::main::matching_desc('Voodoo'); + push @l, "Device3Dfx", "Glide_V3", "XFree86-glide-module" if pci_probing::main::matching_desc('Voodoo'); require timezone; require lang; push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index d061a231e..4ed27fb1e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -399,8 +399,10 @@ Consoles 1,3,4,7 may also contain interesting information"; /(.*)\.ttf/i and symlink "$D/$_", "$o->{prefix}$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D"); } } - run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir") if $hasttf; - + if ($hasttf) { + run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir"); + run_program::rooted($o->{prefix}, "chkfontpath", "--add", $dest); + } foreach (install_any::list_skels()) { my $found; substInFile { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index def291362..6df194793 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1148,11 +1148,8 @@ sub setup_thiskind { if ($allow_probe) { eval { @l = $o->load_thiskind($type) }; - if ($@) { - $o->errorInStep($@); - } else { - return if $auto && (@l || !$at_least_one); - } + $o->ask_warn('', $@) if $@; + return if $auto && (@l || !$at_least_one); } while (1) { my $msg = @l ? diff --git a/perl-install/modules.pm b/perl-install/modules.pm index b0417098e..6e9afe25f 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -438,7 +438,7 @@ sub load_raw { /^irq=(\d+)/ and eval { output "/proc/parport/0/irq", $1 }; } } - die "insmod'ing modules " . join(", ", @failed) . " failed" if @failed; + die "insmod'ing module " . join(", ", map { $_->[0] } @failed) . " failed" if @failed; } sub read_already_loaded() { diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index ed3f5cd16..d02aaf8d2 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -144,6 +144,7 @@ sub gtktext_insert($$) { sub gtkroot { Gtk->init; + Gtk->set_locale; Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW); } diff --git a/perl-install/share/compssList b/perl-install/share/compssList index b53e68da4..bf2a50335 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -85,11 +85,12 @@ XFree86-Xnest 0 0 55 XFree86-Xvfb 25 0 31 XFree86-cyrillic-fonts -20 -30 -20 XFree86-devel 12 0 55 -XFree86-libs 10 0 0 -XFree86-xfs 0 0 0 XFree86-doc -30 -30 -30 +XFree86-glide-module 28 0 21 +XFree86-libs 10 0 0 XFree86-server -30 -30 -30 XFree86-server-common -30 -30 -30 +XFree86-xfs 0 0 0 XaoS 40 0 25 XaoS-aalib 0 0 0 XaoS-svgalib 0 0 0 @@ -856,7 +857,7 @@ npxanim 75 0 61 nscd 0 40 0 nss_ldap 0 55 25 ntsysv 0 65 25 -numlock 65 0 60 +numlock -11 -11 -11 ocaml 0 0 35 ocaml-emacs 0 0 20 ocamltk 0 0 20 diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 8bff3e2eb..ee348b93f 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -21,10 +21,16 @@ my $in = vnew interactive('su'); my %l = ( _("Configure LILO/GRUB") => '', - _("Create a boot floppy") => '/usr/X11R6/bin/drakfloppy', - _("Format floppy") => '/usr/bin/gfloppy', + _("Create a boot floppy") => ['/usr/X11R6/bin/drakfloppy'], + _("Format floppy") => [ '/usr/bin/kfloppy', '/usr/bin/gfloppy' ], ); --x $l{$_} or delete $l{$_} foreach grep { $l{$_} } keys %l; +while (my ($k, $v) = each %l) { + $v or next; + foreach (@$v) { + -x $_ and $l{$k} = $_, last; + } + -x $l{$k} or delete $l{$_}; +} if ($ENV{DISPLAY} && c::Xtest($ENV{DISPLAY})) { my $cmd = $l{$in->ask_from_list(_("Choice"), _("What do you want to do?"), [ keys %l ])}; |