From 23d00c78349b7980d2f0c231f28b190957d1f9e1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 15 Jan 2003 23:25:02 +0000
Subject: do not "use standalone" in a module used during install!

---
 perl-install/harddrake/sound.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/harddrake/sound.pm')

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();
 }
 
 
-- 
cgit v1.2.1