diff options
| -rw-r--r-- | docs/TODO | 8 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/modules.pm | 5 |
3 files changed, 8 insertions, 11 deletions
@@ -23,9 +23,6 @@ kdelnk in mandrake_desk (especially Kppp -> Internet) rpmdrake and same name packages -segfault in linuxconf (adapter 1 empty) -(test with the sysconfig sent) - UDMA66 (ultra66.o for promise) just before release: @@ -309,3 +306,8 @@ suggested partition tables must be better foreach installClass (done,pix)test bug with lilo and windows (if not on mbr) (done,pix)removed icons come back later (kde desktop) + +(done,pix(was bug in upgrade reading old config)) + segfault in linuxconf (adapter 1 empty) + (test with the sysconfig sent) + diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 9198279c3..64aeba2b5 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -183,12 +183,6 @@ sub choosePackages($$$$) { sub beforeInstallPackages { my ($o) = @_; - - $o->{bootloader}{perImageAppend} .= " " . join(" ", grep { /^ide/ } split ' ', cat_("/proc/cmdline")); - if (my @l = detect_devices::getIDEBurners()) { - $o->{bootloader}{perImageAppend} .= " " . join(" ", map { "$_=ide-scsi" } @l); - } - network::add2hosts("$o->{prefix}/etc/hosts", "localhost.localdomain", "127.0.0.1"); require pkgs; pkgs::init_db($o->{prefix}, $o->{isUpgrade}); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 7bae980d5..84d2b630e 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -301,9 +301,10 @@ sub text2driver($) { } sub add_alias($$) { - my ($alias, $name); - $conf{$_}{alias} && $conf{$_}{alias} eq $name and return foreach keys %conf; + my ($alias, $name) = @_; + /\Q$alias/ && $conf{$_}{alias} && $conf{$_}{alias} eq $name and return foreach keys %conf; $alias .= $scsi++ || '' if $alias eq 'scsi_hostadapter'; + log::l("adding alias $alias to $name"); $conf{$alias}{alias} ||= $name; 1; } |