diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-01-05 15:23:32 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-01-05 15:23:32 +0000 |
| commit | e25c04dbe39158da54460b2979ce657ecfbc85de (patch) | |
| tree | 6a8664602386750eaaea64c1b1d72e9b25c92957 | |
| parent | 3af053ecfc2105a9637a86864012b6a6a1492c75 (diff) | |
| download | drakx-e25c04dbe39158da54460b2979ce657ecfbc85de.tar drakx-e25c04dbe39158da54460b2979ce657ecfbc85de.tar.gz drakx-e25c04dbe39158da54460b2979ce657ecfbc85de.tar.bz2 drakx-e25c04dbe39158da54460b2979ce657ecfbc85de.tar.xz drakx-e25c04dbe39158da54460b2979ce657ecfbc85de.zip | |
use $::prefix
| -rw-r--r-- | perl-install/modules.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index cfc09890f..ffe9a9555 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -248,8 +248,8 @@ sub mergein_conf { } sub write_conf() { - my $file = "$prefix/etc/modules.conf"; - rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed + my $file = "$::prefix/etc/modules.conf"; + rename "$::prefix/etc/conf.modules", $file; #- make the switch to new name if needed #- Substitute new aliases in modules.conf (if config has changed) substInFile { @@ -286,11 +286,11 @@ sub write_conf() { my @l; push @l, 'scsi_hostadapter' if !is_empty_array_ref($conf{scsi_hostadapter}{probeall}); push @l, 'bttv' if any { $_->{driver} eq 'bttv' } detect_devices::probeall(); - 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/modules", @l); + append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l); #- 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"; + run_program::rooted($::prefix, "/sbin/generate-modprobe.conf", ">", "/etc/modprobe.conf") if -e "$::prefix/etc/modprobe.conf"; } sub append_to_modules_loaded_at_startup { |