summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-08 12:39:42 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-08 12:39:42 +0000
commit8a23e0f29d13743fb634ba02310f78dda17e76e1 (patch)
treeebc9519e0dcc2d2869c895a46a527ebe4080713c /perl-install
parent3504b33ada09708140a98e1f0bc15d1c4c31f9a6 (diff)
downloaddrakx-8a23e0f29d13743fb634ba02310f78dda17e76e1.tar
drakx-8a23e0f29d13743fb634ba02310f78dda17e76e1.tar.gz
drakx-8a23e0f29d13743fb634ba02310f78dda17e76e1.tar.bz2
drakx-8a23e0f29d13743fb634ba02310f78dda17e76e1.tar.xz
drakx-8a23e0f29d13743fb634ba02310f78dda17e76e1.zip
do not try to add media to /etc/fstab (#49621)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake13
2 files changed, 4 insertions, 11 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8900c2a8c..7cb0a9b18 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- harddrake service:
+ o do not try to add media to /etc/fstab (#49621)
- harddrake:
o list card readers as system components instead of unknows devices
o when device has no description, use vendor string
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index e5af418f4..deaea0b8d 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -149,17 +149,8 @@ foreach my $hw_class (@harddrake::data::tree) {
next if $Ident eq 'MOUSE' && $kernel_major ne $previous_kernel_config{KERNEL} && $cfg{"DETECT_$Ident"} ne 'force';
- my @configurator_pool;
- if (harddrake::data::is_auto_configurable_class($Ident)) {
- foreach my $device (@ID{@added}) {
- push @configurator_pool, harddrake::data::set_media_auto_configurator($device);
- }
- foreach my $device (@$oldconfig{@was_removed}) {
- push @configurator_pool, harddrake::data::set_media_remover($device);
- }
- } else {
- @configurator_pool = $configurator;
- }
+ my @configurator_pool = $configurator;
+
if ($Ident eq "AUDIO") {
# automatic sound slots configuration
rm_rf("/etc/asound.state") if -e "/etc/asound.state";