"je n'en veux + de cette engeance" (c) pixel :

make explanations provided by log and not anymore by standalone,
thus preventing using standalone in drakx (which is bad)

3 files changed, 6 insertions, 13 deletions

diff --git a/perl-install/harddrake/TODO b/perl-install/harddrake/TODO
index bb9e8019d..6612961f7 100644
--- a/perl-install/harddrake/TODO
+++ b/perl-install/harddrake/TODO
@@ -9,11 +9,9 @@
 *** enable the user to force a module (isa, isapnp, ...)
 *** print "(not loaded)" if module isn't loaded
 *** add bus_position to make unique id in ui
-*** cdrom (must be done by harddrake):
+*** cdrom (must be done by diskdrake):
 **** ide-scsi / ide-cd switch
-**** supermount switch
 *** use fbgtk+2 when booting on fbcon for smoother GUI => interactive::fbgtk
-*** translate all fields
 *** write dialogs in ugtk rather in interactive to make them transcient
 *** help: 
 **** print fields in black and their description in blue as for information fields
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 953c76336..365bc42fe 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -21,6 +21,7 @@ use run_program;
 use modules;
 use list_modules;
 use detect_devices;
+use log;
 
 my $has_nvaudio = -x '/lib/modules/' . c::kernel_version() . '/';
 
@@ -139,15 +140,9 @@ sub get_alternative {
     $alsa2oss{$driver} || $oss2alsa{$driver};
 }
 
-sub explain {
-    require standalone;
-    standalone::explanations(@_) unless $::isInstall;
-}
-
-
 sub do_switch {
     my ($old_driver, $new_driver) = @_;
-    explain("removing old $old_driver\n");
+    log::explanations("removing old $old_driver\n");
     rooted("service sound stop") unless $blacklisted;
     rooted("service alsa stop") if $old_driver =~ /^snd-/ && !$blacklisted;
     unload($old_driver); #    run_program("/sbin/modprobe -r $driver"); # just in case ...
@@ -159,7 +154,7 @@ sub do_switch {
         rooted("/sbin/chkconfig --add alsa");
         load($new_driver); # service alsa is buggy
     } else { run_program::run("/sbin/chkconfig --del alsa") }
-    explain("loading new $new_driver\n");
+    log::explanations("loading new $new_driver\n");
     rooted("/sbin/chkconfig --add sound"); # just in case ...
     rooted("service sound start") unless $blacklisted;
 }
@@ -213,7 +208,7 @@ To use alsa, one can either use:
                                 ]))
         {
             return if $new_driver eq $driver;
-            explain("switching audio driver from '$driver' to '$new_driver'\n");
+            log::explanations("switching audio driver from '$driver' to '$new_driver'\n");
             $in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n
 It has been reported to oopses the kernel on unloading.\n
 The new \"%s\" driver'll only be used on next bootstrap.", $driver, $new_driver)) if $blacklisted;
diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index bb41dfc6f..e7763471c 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -240,7 +240,7 @@ If your card is misdetected, you can force the right tuner and card types here.
             join(' ', map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers));
         if ($options) {
             log::l("[harddrake::bttv] $options");
-#             standalone::explanations("modified file /etc/modules.conf ($options)") if $::isStandalone;
+#             log::explanations("modified file /etc/modules.conf ($options)") if $::isStandalone;
               modules::set_options("bttv", $options);
           }
     }