From 9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 5 May 2000 10:39:25 +0000 Subject: no_comment --- perl-install/ChangeLog | 8 ++++++++ perl-install/Xconfigurator.pm | 2 ++ perl-install/any.pm | 2 +- perl-install/fsedit.pm | 2 +- perl-install/install_steps.pm | 3 +-- perl-install/install_steps_gtk.pm | 2 +- perl-install/install_steps_interactive.pm | 5 ++--- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index aed10f757..ee89fc849 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,13 @@ 2000-05-05 Pixel + * install_steps_interactive.pm (setup_thiskind): replace return by + next in case load_module fails. + + * install_steps_gtk.pm (selectInstallClass1): translate Install/Upgrade + + * Xconfigurator.pm (cardConfiguration): force xf4 for rage 128's + * Xconfigurator.pm (testFinalConfig): force $bad_card for xf4 + * pkgs.pm (correctSize): updated for 7.1 * install_any.pm (getAvailableSpace): move the removing of diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 3f7d6e00b..22b5a5434 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -168,6 +168,7 @@ sub cardConfiguration(;$$$) { add2hash($card, cardName2card($card->{type})) if $card->{type}; add2hash($card, { vendor => "Unknown", board => "Unknown" }); + $::xf4 = $card->{identifier} =~ /Rage 128/ if !$::expert; $card->{prog} = "/usr/X11R6/bin/" . ($::xf4 && $card->{driver} ? 'XFree86' : "XF86_$card->{server}"); -x "$prefix$card->{prog}" or $install && do { @@ -299,6 +300,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"; + $bad_card ||= $::xf4; 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/any.pm b/perl-install/any.pm index 34c7e1720..7bbb4ee09 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -70,7 +70,7 @@ sub setupBootloader { $in->set_help("setupBootloaderGeneral") unless $::isStandalone; if ($::expert) { - my $m = $in->ask_from_list_('', _("Which bootloader(s) do you want to use?"), [ keys(%{$b->{methods}}), __("None") ]) or return; + my $m = $in->ask_from_list_('', _("Which bootloader(s) do you want to use?"), [ keys(%{$b->{methods}}), __("None") ], 'grub') or return; $b->{methods}{$_} = 0 foreach keys %{$b->{methods}}; $b->{methods}{$m} = 1 if $m ne "None"; } diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 844762905..c0b5b4fa9 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -185,7 +185,7 @@ sub suggest_part($$$;$) { grep { $_->{size} <= ($part->{maxsize} || $part->{size}) } grep { !has_mntpoint($_->{mntpoint}, $hds) || isSwap($_) && !$has_swap } grep { !$_->{hd} || $_->{hd} eq $hd->{device} } - grep { !$part->{type} || $part->{type} == $_->{type} || isTrueFS($part->{type}) && isTrueFS($_->{type}) } + grep { !$part->{type} || $part->{type} == $_->{type} || isTrueFS($part) && isTrueFS($_) } @$suggestions or return; #- if (arch() =~ /^i386/) { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 503e30bf0..21af38d7e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -415,8 +415,7 @@ GridHeight=70 } #- to unsure linuxconf doesn't cry against those files being in the future - -e $_ and touch($_) foreach map { "$o->{prefix}/$_" } - '/etc/conf.modules', '/etc/crontab', '/etc/sysconfig/network', '/etc/sysconfig/mouse', '/etc/X11/fs/config'; + -e $_ and touch($_) foreach map { "$o->{prefix}/$_" } '/etc/conf.modules', '/etc/crontab', '/etc/sysconfig/mouse', '/etc/X11/fs/config'; #- move some file after an upgrade that may be seriously annoying. #- and rename saved files to .mdkgiorig. diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 82b4dca5f..37a852ecd 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -156,7 +156,7 @@ sub selectInstallClass1 { $radio->set_active($_ eq $def); $radio } @$l), gtkadd(create_hbox(), map { my $v = $_; - my $b = new Gtk::Button($_); + my $b = new Gtk::Button(translate($_)); $focused = $b if $_ eq $def2; gtksignal_connect($b, "clicked" => sub { $w->{retval} = $v; Gtk->main_quit }); } @$l2) diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1e52a1147..e8ec6c4fd 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -440,8 +440,7 @@ sub configureNetwork($) { #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain...")); #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf}); #- } - $last->{BOOTPROTO} =~ /^(dhcp|bootp)$/ || - $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) or return; + $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) if $last->{BOOTPROTO} !~ /^(dhcp|bootp)$/; } install_steps::configureNetwork($o); @@ -1180,7 +1179,7 @@ sub setup_thiskind { $r = $o->ask_from_list_('', $msg, $opt, "No") unless $at_least_one && @l == 0; if ($r eq "No") { return } elsif ($r eq "Yes") { - push @l, $o->load_module($type) || return; + push @l, $o->load_module($type) || next; } else { #-eval { commands::modprobe("isapnp") }; require pci_probing::main; -- cgit v1.2.1