From 9d026054bbb21cb8b73a78693bc3d89649c869e3 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Fri, 17 Aug 2001 11:04:05 +0000
Subject: corrected connection script creation

---
 perl-install/network/ethernet.pm   | 9 ++-------
 perl-install/network/netconnect.pm | 8 +++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 23504d83c..518834848 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -49,11 +49,11 @@ Default is dhcpcd"),
     write_cnx_script($netc, "cable",
 qq(
 #!/bin/bash
-ifup $netc->{NET_DEVICE}
+/sbin/ifup $netc->{NET_DEVICE}
 ),
 qq(
 #!/bin/bash
-ifdown $netc->{NET_DEVICE}
+/sbin/ifdown $netc->{NET_DEVICE}
 ));
 }
 
@@ -218,11 +218,6 @@ such as ``mybox.mylab.myco.com''."),
 	$netc->{HOSTNAME} ne $dhcp_hostname and $netc->{DHCP_HOSTNAME} = $netc->{HOSTNAME};
     } else {
 	configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1;
-	if ( $netc->{GATEWAY} ) {
-	    unlink "$prefix/etc/sysconfig/network-scripts/net_cnx_up";
-	    unlink "$prefix/etc/sysconfig/network-scripts/net_cnx_down";
-	    undef $netc->{NET_DEVICE};
-	}
     }
     miscellaneousNetwork($in);
     1;
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 326f6cd48..456c9276d 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -213,7 +213,13 @@ ifdown eth0
     } elsif ($nb == 1) {
 	$netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0];
     }
-    $netc->{internet_cnx_choice} and write_cnx_script($netc);
+    if ($netc->{internet_cnx_choice} ) {
+	write_cnx_script($netc);
+    } else {
+	unlink "$prefix/etc/sysconfig/network-scripts/net_cnx_up";
+	unlink "$prefix/etc/sysconfig/network-scripts/net_cnx_down";
+	undef $netc->{NET_DEVICE};
+    }
 
     $::isStandalone and ask_connect_now();
 
-- 
cgit v1.2.1