summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-02 02:08:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-02 02:08:06 +0000
commitc7f7e91919ee72b885d5b3253c608393279945ae (patch)
treedf8b892cd5327a89000d39d33824c556e90aaf2a /perl-install/install_any.pm
parente5c9364696dd1de43b51b39cd9f3792c2a50a3cf (diff)
downloaddrakx-c7f7e91919ee72b885d5b3253c608393279945ae.tar
drakx-c7f7e91919ee72b885d5b3253c608393279945ae.tar.gz
drakx-c7f7e91919ee72b885d5b3253c608393279945ae.tar.bz2
drakx-c7f7e91919ee72b885d5b3253c608393279945ae.tar.xz
drakx-c7f7e91919ee72b885d5b3253c608393279945ae.zip
create detect_devices::probe_name() & detect_devices::probe_unique_name() and use them
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a44a98685..70ab8285f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -768,7 +768,7 @@ sub rpmsrate_always_flags {
my $rpmsrate_flags_chosen = {};
$rpmsrate_flags_chosen->{uc($_)} = 1 foreach grep { modules::probe_category("multimedia/$_") } modules::sub_categories('multimedia');
- $rpmsrate_flags_chosen->{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
+ $rpmsrate_flags_chosen->{uc($_)} = 1 foreach detect_devices::probe_name('Flag');
$rpmsrate_flags_chosen->{DOCS} = !$o->{excludedocs};
$rpmsrate_flags_chosen->{UTF8} = $o->{locale}{utf8};
$rpmsrate_flags_chosen->{BURNER} = 1 if detect_devices::burners();
@@ -814,7 +814,7 @@ sub default_packages {
push @l, "mdadm" if !is_empty_array_ref($o->{all_hds}{raids});
push @l, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms});
push @l, "alsa", "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4;
- push @l, map { if_($_->{driver} =~ /^Pkg:(.*)/, $1) } detect_devices::probeall();
+ push @l, detect_devices::probe_name('Pkg');
my $dmi_BIOS = detect_devices::dmidecode_category('BIOS');
my $dmi_Base_Board = detect_devices::dmidecode_category('Base Board');