write_conf() doesn't need $prefix anymore

8 files changed, 12 insertions, 12 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 4ce50506a..9a5c98b26 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -276,7 +276,7 @@ sub setupBootloader {
     my ($_clicked, $ent_number, $auto) = @_;
     return if $::g_auto_install || $::uml_install;
 
-    modules::write_conf($o->{prefix});
+    modules::write_conf();
 
     installStepsCall($o, $auto, 'setupBootloaderBefore') if $ent_number == 1;
     installStepsCall($o, $auto, 'setupBootloader', $ent_number);
@@ -289,7 +289,7 @@ sub configureX {
 
     #- done here and also at the end of install2.pm, just in case...
     install_any::write_fstab($o);
-    modules::write_conf($o->{prefix});
+    modules::write_conf();
 
     require pkgs;
     installStepsCall($o, $auto, 'configureX') if pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} || $::testing;
@@ -640,7 +640,7 @@ sub main {
     install_any::log_sizes($o);
     install_any::remove_advertising($o);
     install_any::write_fstab($o);
-    modules::write_conf($o->{prefix});
+    modules::write_conf();
     detect_devices::install_addons($o->{prefix});
 
     #- save recovery file if needed (ie disk style install).
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index a7156e69b..00184f3fc 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -981,7 +981,7 @@ sub upNetwork {
 	symlinkf("$o->{prefix}/etc/$_", "/etc/$_") foreach qw(resolv.conf protocols services);
     }
     member($o->{method}, qw(ftp http nfs)) and return 1;
-    modules::write_conf($o->{prefix});
+    modules::write_conf();
     if (hasNetwork($o)) {
 	if ($o->{netcnx}{type} =~ /adsl|lan|cable/) {
 	    require network::netconnect;
@@ -1003,7 +1003,7 @@ sub downNetwork {
     my ($o, $costlyOnly) = @_;
 
     $o->{method} eq "ftp" || $o->{method} eq "http" || $o->{method} eq "nfs" and return 1;
-    modules::write_conf($o->{prefix});
+    modules::write_conf();
     if (hasNetwork($o)) {
 	if (!$costlyOnly) {
 	    require network::netconnect;
diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm
index ec7b75826..2fcfbb672 100644
--- a/perl-install/modules/interactive.pm
+++ b/perl-install/modules/interactive.pm
@@ -22,7 +22,7 @@ sub config_window {
 	   my $options = join(' ', map { if_($conf{$_}, "$_=$conf{$_}") } keys %conf);
 	   if ($options) {
 		  modules::set_options($data->{driver}, $options);
-		    modules::write_conf;
+		    modules::write_conf();
 		}
     }
 }
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 24acfb5b8..981c3bf06 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -404,7 +404,7 @@ sub write_conf {
     my ($in, $mouse, $b_keep_auxmouse_unchanged) = @_;
 
     &write($in, $mouse);
-    modules::write_conf('') if $mouse->{device} eq "usbmouse" && !$::testing;
+    modules::write_conf() if $mouse->{device} eq "usbmouse" && !$::testing;
 
     require Xconfig::xfree;
     my $xfree_conf = Xconfig::xfree->read;
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index fa7099afb..a0f273308 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -200,7 +200,7 @@ user "$adsl->{login}"
 						      ['ppp-compress-21', 'bsd_comp'],
 						      ['ppp-compress-24', 'ppp_deflate'],
 						      ['ppp-compress-26', 'ppp_deflate'];
-	$::isStandalone and modules::write_conf($prefix);
+	$::isStandalone and modules::write_conf();
 	$in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->ensure_is_installed('speedtouch_mgmt', '/usr/share/speedtouch/mgmt.o', 'auto');
 	-e "$prefix/usr/share/speedtouch/mgmt.o" and goto end_firmware;
 	
@@ -252,7 +252,7 @@ lcp-echo-interval 0
 	modules::add_alias($_->[0], $_->[1]) foreach  ['char-major-108', 'ppp_generic'],
 						      ['tty-ldisc-14', 'ppp_synctty'],
 						      ['tty-ldisc-13', 'n_hdlc'];
-	$::isStandalone and modules::write_conf($prefix);
+	$::isStandalone and modules::write_conf();
     }
 
     if ($adsl_type eq 'pptp') {
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index f67033862..80419f9b5 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -36,7 +36,7 @@ qq(
 /sbin/ifup lo
 ), $netcnx->{type});
     }
-    $::isStandalone and modules::write_conf($prefix);
+    $::isStandalone and modules::write_conf();
     1;
 }
 
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 06c87f287..b4d7da68c 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -680,7 +680,7 @@ I cannot set up this connection type.")), return;
                     format => sub { my ($e) = @_; $e->[0] . ($e->[1] ? " (using module $e->[1])" : "") },
                     
                     post => sub {
-                        modules::write_conf($::prefix) if $::isStandalone;
+                        modules::write_conf() if $::isStandalone;
                         my $_device = conf_network_card_backend($netc, $intf, $type, $interface->[0], $ipadr, $netadr);
                         return "lan";
                     },
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index 3f862c21f..9ae4b9664 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -55,5 +55,5 @@ http://www.linux-mandrake.com/en/hardware.php3") .
 N("\n\n\nNote: if you've an ISA PnP sound card, you'll have to use the sndconfig program.  Just type \"sndconfig\" in a console.")));
 }
 
-modules::write_conf;
+modules::write_conf();
 $in->exit(0);