summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-30 11:07:23 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-30 11:07:23 +0000
commit41a4cedee42011808156c59484267bf184e19a4c (patch)
treec9b87fa178fc74bf271296f611e9c035a8401aaa
parent4e84fa3fa0e27e8ea37316217dbb117aa118dc69 (diff)
downloaddrakx-41a4cedee42011808156c59484267bf184e19a4c.tar
drakx-41a4cedee42011808156c59484267bf184e19a4c.tar.gz
drakx-41a4cedee42011808156c59484267bf184e19a4c.tar.bz2
drakx-41a4cedee42011808156c59484267bf184e19a4c.tar.xz
drakx-41a4cedee42011808156c59484267bf184e19a4c.zip
service_harddrake: fix autoconfiguration of harddisks (because an undefined configurator will make harddrake skip all disks)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index be3d869b8..4c8773165 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
- service_harddrake:
o do not allow fbdev if /proc/fb is empty
o fix kbluetooth config path
+ o fix autoconfiguration of harddisks
Version 10.29.5 - 20 May 2008
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 9bc657a55..537cb177d 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -46,12 +46,12 @@ sub set_removable_configurator {
sub set_media_auto_configurator {
my ($device) = @_;
- return "/usr/sbin/drakupdate_fstab --auto --add $device->{device}" if is_auto_configurable_media($device);
+ is_auto_configurable_media($device) ? "/usr/sbin/drakupdate_fstab --auto --add $device->{device}" : ();
}
sub set_media_remover {
my ($device) = @_;
- return "/usr/sbin/drakupdate_fstab --del $device->{device}" if is_auto_configurable_media($device);
+ is_auto_configurable_media($device) ? "/usr/sbin/drakupdate_fstab --del $device->{device}" : ();
}
my $modules_conf = modules::any_conf->read;