From 9602001c7823079a8e8ca0e737a8fe2f6c0db0d2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 4 Jul 2002 22:25:15 +0000
Subject: adapt to new modules.pm

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

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ea2639dd3..241c56da9 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -359,7 +359,7 @@ sub setDefaultPackages {
 	    }
 	}
     }
-    $o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::get_that_type($_) } ('tv', 'scanner', 'photo', 'sound');
+    $o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::probe_category("multimedia/$_") } modules::sub_categories('multimedia');
     $o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
     $o->{compssUsersChoice}{SYSTEM} = 1;
     $o->{compssUsersChoice}{DOCS} = !$o->{excludedocs};
@@ -823,7 +823,7 @@ sub loadO {
 
 	my $b = before_leaving {
 	    fs::umount("/mnt") unless $::testing;
-	    modules::unload($_) foreach qw(vfat fat);
+	    modules::unload(qw(vfat fat));
 	};
 	$o = loadO($O, $f);
     } else {
-- 
cgit v1.2.1