summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-13 07:52:16 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-13 07:52:16 +0000
commit79dcce57bacc2e825e4dda6f4e234fd4a6875f07 (patch)
tree79e3e5ecf5fe2759131e0ecc75dce0b38dc96357
parenta790b7b41860505b1ec38111052a55a4ec550dd9 (diff)
downloaddrakx-backup-do-not-use-79dcce57bacc2e825e4dda6f4e234fd4a6875f07.tar
drakx-backup-do-not-use-79dcce57bacc2e825e4dda6f4e234fd4a6875f07.tar.gz
drakx-backup-do-not-use-79dcce57bacc2e825e4dda6f4e234fd4a6875f07.tar.bz2
drakx-backup-do-not-use-79dcce57bacc2e825e4dda6f4e234fd4a6875f07.tar.xz
drakx-backup-do-not-use-79dcce57bacc2e825e4dda6f4e234fd4a6875f07.zip
use diskdrake to configure cdroms, dvroms, cd|dvd -burners,
floppies and zip drives
-rwxr-xr-xperl-install/standalone/harddrake26
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index dc76375b2..2fbf2ab3e 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -187,7 +187,7 @@ my $selection = gtksignal_connect($tree->get_selection(), 'changed' => sub {
show_hide($current_device->{driver} !~ /(unknown|.*\|.*)/ && $current_device->{driver} !~ /^Card:/, $module_cfg_button);
$current_configurator = $configurators{$id};
- show_hide(-x $current_configurator, $config_button);
+ show_hide(-x scalar first(split /\s+/, $current_configurator), $config_button); # strip arguments for -x test
return 1;
}
}
@@ -234,7 +234,9 @@ foreach (@harddrake::data::tree) {
my $i = $_;
$_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(bus id);
}
- if ($Ident eq "AUDIO") {
+ if ($Ident =~ /FLOPPY|ZIP|DVDROM|CDROM|BURNER/) {
+ $configurator = "/usr/sbin/diskdrake --removable=$_->{device}";
+ } elsif ($Ident eq "AUDIO") {
require harddrake::sound;
my $alter = harddrake::sound::get_alternative($_->{driver});
$_->{alternative_drivers} = join(':', @$alter) if $alter->[0] ne 'unknown';