diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-02 22:43:43 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-02 22:43:43 +0000 |
| commit | fbd335923be01d06f013eda6557448dc38a246fd (patch) | |
| tree | 3d96acdb9da66fe5e7182cd4e3956825e77c610e /perl-install | |
| parent | b707231329f40f0537da5a7a8a6033cf8bb8fbf5 (diff) | |
| download | drakx-backup-do-not-use-fbd335923be01d06f013eda6557448dc38a246fd.tar drakx-backup-do-not-use-fbd335923be01d06f013eda6557448dc38a246fd.tar.gz drakx-backup-do-not-use-fbd335923be01d06f013eda6557448dc38a246fd.tar.bz2 drakx-backup-do-not-use-fbd335923be01d06f013eda6557448dc38a246fd.tar.xz drakx-backup-do-not-use-fbd335923be01d06f013eda6557448dc38a246fd.zip | |
no_comment
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/modules.pm | 5 |
2 files changed, 3 insertions, 8 deletions
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; } |