From 3a9a3654d1112f9a59d46846b579b7a803167713 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 30 Jan 2004 14:19:45 +0000 Subject: xxx-agp is not loaded at install, so when_load() is not the right place --- perl-install/install_steps.pm | 4 ++++ perl-install/modules.pm | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 66cf2e56f..38a46334c 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -334,6 +334,10 @@ sub beforeInstallPackages { log::l("setting excludedocs to $o->{excludedocs}"); substInFile { s/%_excludedocs.*//; $_ .= "%_excludedocs yes\n" if eof && $o->{excludedocs} } "$o->{prefix}/etc/rpm/macros"; + if (my ($agp) = modules::probe_category('other/agpgart')) { + modules::add_alias('agpgart', $agp); + } + #- add oem theme if the files exists. mkdir_p("$o->{prefix}/usr/share"); install_any::getAndSaveFile("Mandrake/base/oem-theme.rpm", "$o->{prefix}/usr/share/oem-theme.rpm"); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index e37777e73..47c3bec8c 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -378,7 +378,6 @@ sub when_load { load('snd-pcm-oss') if $name =~ /^snd-/; add_alias('ieee1394-controller', $name) if member($name, 'ohci1394'); add_probeall('usb-interface', $name) if member($name, qw(usb-uhci usb-ohci ehci-hcd uhci-hcd ohci-hcd)); - add_alias('/dev/agpgart', $name) if $name =~ /-agp$/; $conf{$name}{options} = join " ", @options if @options; -- cgit v1.2.1