summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog3
-rw-r--r--perl-install/install2.pm8
-rw-r--r--perl-install/install_steps.pm6
-rw-r--r--perl-install/modules.pm5
-rwxr-xr-xperl-install/standalone/mousedrake2
5 files changed, 15 insertions, 9 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 29675c557..60018e4bc 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,8 @@
2000-06-16 Pixel <pixel@mandrakesoft.com>
+ * modules.pm (write_conf): rename conf.modules to modules.conf if
+ needed. Outputs to modules.conf
+
* detect_devices.pm (cdroms): fix using scd0 for ide-burners when
already a scsi cdrom drive
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cb6df9274..8e3414429 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -482,7 +482,7 @@ sub addUser {
#------------------------------------------------------------------------------
#-PADTODO
sub createBootdisk {
- modules::write_conf("$o->{prefix}/etc/conf.modules");
+ modules::write_conf($o->{prefix});
$o->createBootdisk($_[1] == 1);
}
@@ -491,7 +491,7 @@ sub createBootdisk {
sub setupBootloader {
return if $::g_auto_install;
- modules::write_conf("$o->{prefix}/etc/conf.modules");
+ modules::write_conf($o->{prefix});
$o->setupBootloaderBefore if $_[1] == 1;
$o->setupBootloader($_[1] - 1);
@@ -505,7 +505,7 @@ sub configureX {
#- done here and also at the end of install2.pm, just in case...
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
- modules::write_conf("$o->{prefix}/etc/conf.modules");
+ modules::write_conf($o->{prefix});
$o->setupXfree if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) || $clicked;
}
@@ -728,7 +728,7 @@ sub main {
install_any::ejectCdrom();
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
- modules::write_conf("$o->{prefix}/etc/conf.modules");
+ modules::write_conf($o->{prefix});
#- to ensure linuxconf doesn't cry against those files being in the future
foreach ('/etc/conf.modules', '/etc/crontab', '/etc/sysconfig/mouse', '/etc/X11/fs/config') {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 83891d4dc..f96d645ff 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -25,7 +25,7 @@ use any;
use fs;
@filesToSaveForUpgrade = qw(
-/etc/ld.so.conf /etc/fstab /etc/hosts /etc/conf.modules
+/etc/ld.so.conf /etc/fstab /etc/hosts /etc/conf.modules /etc/modules.conf
);
@@ -965,7 +965,7 @@ sub upNetwork {
symlinkf("$o->{prefix}/etc/$_", "/etc/$_");
}
- modules::write_conf("$o->{prefix}/etc/conf.modules");
+ modules::write_conf($o->{prefix});
if ($o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
network::up_it($o->{prefix}, $o->{intf});
} elsif (!$pppAvoided && $o->{modem} && !$o->{modem}{isUp}) {
@@ -983,7 +983,7 @@ sub upNetwork {
sub downNetwork {
my ($o, $pppOnly) = @_;
- modules::write_conf("$o->{prefix}/etc/conf.modules");
+ modules::write_conf($o->{prefix});
if (!$pppOnly && $o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
network::down_it($o->{prefix}, $o->{intf});
} elsif ($o->{modem} && $o->{modem}{isUp}) {
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 28a5cd6b7..f68e8f726 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -487,7 +487,10 @@ sub read_conf($;$) {
}
sub write_conf {
- my ($file) = @_;
+ my ($prefix) = @_;
+ my $file = "$prefix/etc/modules.conf";
+
+ rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed
#- remove the post-install supermount stuff. We may have to add some more
substInFile { $_ = '' if /^post-install supermount/ } $file;
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index d854b913d..ee5c72d54 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -40,7 +40,7 @@ $mouse->{device} = mouse::serial_ports_names2dev(
[ mouse::serial_ports_names() ])) if $mouse->{device} eq "ttyS";
mouse::write('', $mouse);
-modules::write_conf("/etc/conf.modules") if $mouse->{device} eq "usbmouse" && !$::testing;
+modules::write_conf('') if $mouse->{device} eq "usbmouse" && !$::testing;
my $f = "/etc/X11/XF86Config";
my $g = "/etc/X11/XF86Config-4";