diff options
| -rw-r--r-- | perl-install/install_steps.pm | 4 | ||||
| -rw-r--r-- | perl-install/modules.pm | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 298c9c0e6..5c931ca8a 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -335,10 +335,6 @@ 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('various/agpgart')) { - modules::add_alias('agpgart', $agp->{driver}); - } - #- 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 9cc3bc39b..8e5e19288 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -313,9 +313,12 @@ sub write_conf() { my @l; push @l, 'scsi_hostadapter' if !is_empty_array_ref($conf{scsi_hostadapter}{probeall}); push @l, 'bttv' if detect_devices::matching_driver('^bttv$'); + my @l_26 = @l; + if (my ($agp) = probe_category('various/agpgart')) { + push @l_26, $agp->{driver}; + } append_to_modules_loaded_at_startup("$::prefix/etc/modules", @l); - append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l); - + append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l_26); #- use module-init-tools script for the moment run_program::rooted($::prefix, "/sbin/generate-modprobe.conf", ">", "/etc/modprobe.conf") if -e "$::prefix/etc/modprobe.conf"; } |