summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-01-02 17:26:33 +0000
committerOlivier Blin <oblin@mandriva.com>2008-01-02 17:26:33 +0000
commitec404987f040875d9665c95275772c89ea9d8585 (patch)
tree3b467ca9e33528b52c14317e7e4f56d4542a09b4 /perl-install
parent824850333813009052d33952960b6fd386279007 (diff)
downloaddrakx-backup-do-not-use-ec404987f040875d9665c95275772c89ea9d8585.tar
drakx-backup-do-not-use-ec404987f040875d9665c95275772c89ea9d8585.tar.gz
drakx-backup-do-not-use-ec404987f040875d9665c95275772c89ea9d8585.tar.bz2
drakx-backup-do-not-use-ec404987f040875d9665c95275772c89ea9d8585.tar.xz
drakx-backup-do-not-use-ec404987f040875d9665c95275772c89ea9d8585.zip
rename is_auto_configurable_media as is_auto_configurable_class since it just compares class names
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/data.pm6
-rwxr-xr-xperl-install/standalone/service_harddrake2
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 0e4c3a069..c1e6a3d48 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -36,7 +36,7 @@ sub f {
# FIXME: add translated items
sub is_removable { member($_[0], qw(FLOPPY ZIP DVDROM CDROM BURNER)) }
-sub is_auto_configurable_media { is_removable($_[0]) || member($_[0], qw(HARDDISK)) }
+sub is_auto_configurable_class { is_removable($_[0]) || member($_[0], qw(HARDDISK)) }
sub set_removable_configurator {
my ($class, $device) = @_;
@@ -45,12 +45,12 @@ sub set_removable_configurator {
sub set_media_auto_configurator {
my ($class, $device) = @_;
- return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_media($class);
+ return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_class($class);
}
sub set_media_remover {
my ($class, $device) = @_;
- return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($class);
+ return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_class($class);
}
my $modules_conf = modules::any_conf->read;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index fe50b7902..294f07074 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -140,7 +140,7 @@ foreach my $hw_class (@harddrake::data::tree) {
next if $Ident eq 'MOUSE' && $curr_kernel ne $previous_kernel_config{KERNEL} && $cfg{"DETECT_$Ident"} ne 'force';
my @configurator_pool;
- if (harddrake::data::is_auto_configurable_media($Ident)) {
+ if (harddrake::data::is_auto_configurable_class($Ident)) {
foreach my $device (@ID{@added}) {
push @configurator_pool, harddrake::data::set_media_auto_configurator($Ident, $device);
}