diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-01-02 18:35:18 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-01-02 18:35:18 +0000 |
| commit | 06918ccb39aed05ce9b1a375b2b0d11d86cf26aa (patch) | |
| tree | 8a7090a0a1ad050d78ac90c9bb39b3188e4ac99c /perl-install/harddrake | |
| parent | b55506c8fc80035af7244edcc98c52ef8ddcc2c8 (diff) | |
| download | drakx-06918ccb39aed05ce9b1a375b2b0d11d86cf26aa.tar drakx-06918ccb39aed05ce9b1a375b2b0d11d86cf26aa.tar.gz drakx-06918ccb39aed05ce9b1a375b2b0d11d86cf26aa.tar.bz2 drakx-06918ccb39aed05ce9b1a375b2b0d11d86cf26aa.tar.xz drakx-06918ccb39aed05ce9b1a375b2b0d11d86cf26aa.zip | |
harddrake: check that media are not USB keys before auto-configuring them (#34568)
Diffstat (limited to 'perl-install/harddrake')
| -rw-r--r-- | perl-install/harddrake/data.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 0e4c3a069..d4e8d2ee2 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -36,7 +36,8 @@ 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 is_auto_configurable_media { !detect_devices::isKeyUsb($_[0]) } sub set_removable_configurator { my ($class, $device) = @_; @@ -44,13 +45,13 @@ 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); + my ($device) = @_; + return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_media($device); } sub set_media_remover { - my ($class, $device) = @_; - return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($class); + my ($device) = @_; + return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($device); } my $modules_conf = modules::any_conf->read; |