diff options
| -rw-r--r-- | perl-install/ChangeLog | 18 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/interactive.pm | 5 | ||||
| -rw-r--r-- | perl-install/interactive_gtk.pm | 3 | ||||
| -rw-r--r-- | perl-install/interactive_newt.pm | 1 | ||||
| -rw-r--r-- | perl-install/modules.pm | 23 |
6 files changed, 37 insertions, 17 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 92b1fd02b..0a26b3797 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,23 @@ 2000-05-04 Pixel <pixel@mandrakesoft.com> + * install2.pm (configurePrinter): give clicked to printerConfig + + * interactive.pm (ask_from_entries_ref): set default val if not_edit + + * interactive_newt.pm (ask_from_entries_refW): remove setting of + default val. Now done in interactive::ask_from_entries_ref + + * interactive_gtk.pm (ask_from_entries_refW): handle empty value + + * modules.pm (read_already_loaded): ensure that already loaded + modules are put in %loaded. + * modules.pm (load_ide): add loading if ide-probe-mod (for new kernel) + + * lilo.pm (install_lilo): truncate label's to 15 chars + + * install_any.pm (generate_ks_cfg): fix missing space + * install_any.pm (generate_ks_cfg): fix bug for nfs comand + * install2.pm: get rid of autoformat * install_steps.pm (choosePartitionsToFormat): get rid of autoformat diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 11df7afe3..a9696327a 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -820,7 +820,7 @@ sub generate_ks_cfg { if ($o->{method} =~ /ftp|http/) { $ks .= "url --url $ENV{URLPREFIX}\n"; } elsif ($o->{method} =~ /nfs/) { - cat_("/proc/mounts") =~ m|(\S+:\S+)\s+/tmp/rhimage nfs| or die; + cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/rhimage nfs| or die; $ks .= "nfs --server $1 --dir $2\n"; } my %intf = %{$o->{intf}[0]}; @@ -829,7 +829,7 @@ sub generate_ks_cfg { } else { my %l = (ip => $intf{IPADDR}, netmask => $intf{NETMASK}, gateway => $o->{netc}{GATEWAY}); $ks .= "network " . join(" ", map_each { $::b && "--$::a $::b" } %l); - $ks .= "--nameserver $_" foreach network::dnsServers($o->{netc}); + $ks .= " --nameserver $_" foreach network::dnsServers($o->{netc}); $ks .= "\n"; } $ks; diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index f82091458..684f68179 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -227,8 +227,9 @@ sub ask_from_entries_ref($$$$;$%) { if ((ref $_) eq "SCALAR") { { val => $_ } } else { - ($_->{list} && (@{$_->{list}} > 1)) ? - { %$_, type => "list"} : $_; + add2hash_($_, { type => 'list' }) if @{$_->{list}} > 1; #- TODO: remove the if, not needed? + ${$_->{val}} = $_->{list}[0] if $_->{not_edit} && !member(${$_->{val}}, @{$_->{list}}); + $_; } } @$val ]; diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index 98beacdc7..d3f773fbf 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -188,7 +188,6 @@ sub ask_from_entries_refW { $w->entry->set_editable(!$_->{not_edit}); $w->set_popdown_strings(@{$_->{list}}); $w->disable_activate; - $_->{val} ||= $_->{list}[0]; $w; } elsif ($_->{type} eq "bool") { my $w = Gtk::CheckButton->new($_->{text}); @@ -264,7 +263,7 @@ sub ask_from_entries_refW { #-i must say before &$go_to_next, but with it doen't work HACK! $w->signal_emit_stop("key_press_event") if chr($e->{keyval}) eq "\x8d"; }); - $widget->set_text(${$val->[$i]{val}}) if ${$val->[$i]{val}}; + $widget->set_text(${$val->[$i]{val}}); $widget->set_visibility(0) if $val->[$i]{hidden}; } &{$updates[$i]}; diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm index 67238844b..dc21c27e2 100644 --- a/perl-install/interactive_newt.pm +++ b/perl-install/interactive_newt.pm @@ -128,7 +128,6 @@ sub ask_from_entries_refW { #- $_->{type} = "entry" if $_->{type} eq "list" && !$_->{not_edit}; ${$_->{val}} ||= ''; if ($_->{type} eq "list") { - $_->{val} ||= $_->{list}[0]; my $w = Newt::Component::Listbox(-1, -1, 1, 0); $w->ListboxSetWidth(20); $w->ListboxAddEntry($_) foreach @{$_->{list}}; diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 60d9d201c..024936c28 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -137,6 +137,7 @@ arch() =~ /^sparc/ ? ( "sd_mod" => "sd_mod", "ide-mod" => "ide-mod", "ide-probe" => "ide-probe", + "ide-probe-mod" => "ide-probe-mod", }], [ 'disk', { arch() =~ /^sparc/ ? ( @@ -158,15 +159,15 @@ arch() =~ /^sparc/ ? ( }], [ 'cdrom', { arch() !~ /^sparc/ ? ( -#- "sbpcd" => "SoundBlaster/Panasonic", #- removed for space - "aztcd" => "Aztech CD", - "gscd" => "Goldstar R420", - "isp16" => "ISP16/MAD16/Mozart", + "sbpcd" => "SoundBlaster/Panasonic", +#- "aztcd" => "Aztech CD", +#- "gscd" => "Goldstar R420", +#- "isp16" => "ISP16/MAD16/Mozart", #- "mcd" => "Mitsumi", #- removed for space - "mcdx" => "Mitsumi (alternate)", - "optcd" => "Optics Storage 8000", - "cm206" => "Phillips CM206/CM260", - "sjcd" => "Sanyo", +#- "mcdx" => "Mitsumi (alternate)", +#- "optcd" => "Optics Storage 8000", +#- "cm206" => "Phillips CM206/CM260", +#- "sjcd" => "Sanyo", "cdu31a" => "Sony CDU-31A", "sonycd535" => "Sony CDU-5xx", ) : (), @@ -447,9 +448,11 @@ sub load_raw { } sub read_already_loaded() { - foreach (cat_("/proc/modules", "die")) { + foreach (cat_("/proc/modules")) { my ($name) = split; $conf{$name}{loaded} = 1; + my $l = $loaded{($drivers{$name} || next)->{type}} ||= []; + push @$l, $name unless member($name, @$l); } } @@ -603,6 +606,6 @@ sub load_ide { eval { load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"'); delete $conf{"ide-mod"}{options}; - load_multi(qw(ide-probe ide-disk ide-cd)); + load_multi(qw(ide-probe ide-probe-mod ide-disk ide-cd)); } } |