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
commite9808d4ad646941bfdcfd8f8fbf48d0fa2301c30 (patch)
tree990726ad69fabb7c500081cca342363024e3abb1
parent8ab356a377fcfbfa2ef9935c70d71df5dd1376f1 (diff)
downloaddrakx-e9808d4ad646941bfdcfd8f8fbf48d0fa2301c30.tar
drakx-e9808d4ad646941bfdcfd8f8fbf48d0fa2301c30.tar.gz
drakx-e9808d4ad646941bfdcfd8f8fbf48d0fa2301c30.tar.bz2
drakx-e9808d4ad646941bfdcfd8f8fbf48d0fa2301c30.tar.xz
drakx-e9808d4ad646941bfdcfd8f8fbf48d0fa2301c30.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 bb395b872..f7b8c4277 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,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.33 - 29 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;