summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-15 23:25:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-15 23:25:02 +0000
commit23d00c78349b7980d2f0c231f28b190957d1f9e1 (patch)
tree90a432d7f6b1bb24b2324c91d59ed9416bfd1589
parent2a7b8f1c3734f010786ccc8f3162f464e2f28230 (diff)
downloaddrakx-backup-do-not-use-23d00c78349b7980d2f0c231f28b190957d1f9e1.tar
drakx-backup-do-not-use-23d00c78349b7980d2f0c231f28b190957d1f9e1.tar.gz
drakx-backup-do-not-use-23d00c78349b7980d2f0c231f28b190957d1f9e1.tar.bz2
drakx-backup-do-not-use-23d00c78349b7980d2f0c231f28b190957d1f9e1.tar.xz
drakx-backup-do-not-use-23d00c78349b7980d2f0c231f28b190957d1f9e1.zip
do not "use standalone" in a module used during install!
-rw-r--r--perl-install/harddrake/sound.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 5f2ba8cc3..31d11e75d 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -19,7 +19,6 @@ use common;
use interactive;
use run_program;
use modules;
-use standalone;
use list_modules;
use detect_devices;
@@ -143,6 +142,7 @@ sub get_alternative {
sub do_switch {
my ($old_driver, $new_driver) = @_;
+ require standalone;
standalone::explanations("removing old $old_driver\n");
rooted("service sound stop") unless $blacklisted;
rooted("service alsa stop") if $old_driver =~ /^snd-/ && !$blacklisted;
@@ -263,7 +263,7 @@ initlevel 3
sub configure_sound_slots {
each_index {
modules::add_alias("sound-slot-$::i", $_->{driver});
- } getSoundDevices();
+ } detect_devices::getSoundDevices();
}