*** empty log message ***

4 files changed, 8 insertions, 11 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 6d1aaa803..934cea259 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -530,7 +530,7 @@ sub g_auto_install(;$) {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users installClass partitioning isUpgrade manualFstab nomouseprobe crypto security modem useSupermount autoExitInstall); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users installClass partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall); #- TODO modules bootloader 
 
     if (my $card = $::o->{X}{card}) {
 	$o->{X}{$_} = $::o->{X}{$_} foreach qw(default_depth resolution_wanted);
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 132930ecb..8cde0e12b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -838,7 +838,7 @@ sub exitInstall { install_any::unlockCdrom }
 sub hasNetwork {
     my ($o) = @_;
 
-    $o->{intf} && $o->{netc}{NETWORKING} ne 'false' || $o->{modem};
+    $o->{intf} && $o->{netc}{NETWORKING} ne 'false' || $o->{netcnx}{modem};
 }
 
 #------------------------------------------------------------------------------
@@ -852,11 +852,11 @@ sub upNetwork {
     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}) {
+    } elsif (!$pppAvoided && $o->{netcnx}{modem} && !$o->{netcnx}{modem}{isUp}) {
 	eval { modules::load_multi(qw(serial ppp bsd_comp ppp_deflate)) };
 	run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/syslog", "start");
 	run_program::rooted($o->{prefix}, "ifup", "ppp0");
-	$o->{modem}{isUp} = 1;
+	$o->{netcnx}{modem}{isUp} = 1;
     } else {
 	$::testing or return;
     }
@@ -870,11 +870,11 @@ sub downNetwork {
     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}) {
+    } elsif ($o->{netcnx}{modem} && $o->{netcnx}{modem}{isUp}) {
 	run_program::rooted($o->{prefix}, "ifdown", "ppp0");
 	run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/syslog", "stop");
 	eval { modules::unload($_) foreach qw(ppp_deflate bsd_comp ppp serial) };
-	$o->{modem}{isUp} = 0;
+	$o->{netcnx}{modem}{isUp} = 0;
     } else {
 	$::testing or return;
     }
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 0ff5743b5..b7eea5fc2 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -36,9 +36,7 @@ sub new {
 sub configureNetwork {
     my ($o) = @_;
     modules::load_thiskind('net', $o->{pcmcia});
-#-    install_steps::configureNetwork($o);
-    $o->{netcnx}||={};
-    netconnect::net_connect($o->{prefix}, $o->{netcnx}, $o->{netc}, $o->{modem}, $o->{mouse},  $o, $o->{pcmcia}, $o->{intf}, 1);
+    netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{pcmcia}, $o->{intf}, 1);
 }
 
 sub enteringStep($$$) {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d5774fe6f..9795de2d8 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -464,8 +464,7 @@ sub afterInstallPackages($) {
 #------------------------------------------------------------------------------
 sub configureNetwork {
     my ($o, $first_time) = @_;
-    $o->{netcnx}||={};
-    netconnect::net_connect($o->{prefix}, $o->{netcnx}, $o->{netc}, $o->{modem}, $o->{mouse},  $o, $o->{pcmcia}, $o->{intf}, $first_time);
+    netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse},  $o, $o->{pcmcia}, $o->{intf}, $first_time);
 }
 
 #-configureNetworkIntf moved to network