diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-07-29 06:24:22 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-07-29 06:24:22 +0000 |
| commit | 4b072a27e35d3476ea536a12538c092a6152b3f6 (patch) | |
| tree | dfd784b70a9f9e57b178b22a3913173ce08ebeff | |
| parent | 8f375063143633fc031636cf687d7825a06ce325 (diff) | |
| download | drakx-backup-do-not-use-4b072a27e35d3476ea536a12538c092a6152b3f6.tar drakx-backup-do-not-use-4b072a27e35d3476ea536a12538c092a6152b3f6.tar.gz drakx-backup-do-not-use-4b072a27e35d3476ea536a12538c092a6152b3f6.tar.bz2 drakx-backup-do-not-use-4b072a27e35d3476ea536a12538c092a6152b3f6.tar.xz drakx-backup-do-not-use-4b072a27e35d3476ea536a12538c092a6152b3f6.zip | |
merge fix from HEAD: do not automatically configure removable media in
harddrake GUI (only in harddrake service)
| -rw-r--r-- | perl-install/harddrake/data.pm | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 70ce2c5c8..00f6c1d33 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -38,6 +38,11 @@ sub is_removable { $_[0] =~ /FLOPPY|ZIP|DVDROM|CDROM|BURNER/ } sub set_removable_configurator { my ($class, $device) = @_; + return "/usr/sbin/diskdrake --removable=$device->{device}" if is_removable($class); + } + +sub set_removable_auto_configurator { + my ($class, $device) = @_; return "/usr/sbin/drakupdate_fstab --auto --no-flag --add $device->{device}" if is_removable($class); } diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 1b95f6cf1..e107edf57 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -83,7 +83,7 @@ foreach my $hw_class (@harddrake::data::tree) { my @configurator_pool; if (harddrake::data::is_removable($Ident)) { foreach my $device (@ID{@added}) { - push @configurator_pool, harddrake::data::set_removable_configurator($Ident, $device); + push @configurator_pool, harddrake::data::set_removable_auto_configurator($Ident, $device); }; foreach my $device (@$oldconfig{@was_removed}) { push @configurator_pool, harddrake::data::set_removable_remover($Ident, $device); |