summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-08-17 11:04:05 +0000
committerdamien <damien@mandriva.com>2001-08-17 11:04:05 +0000
commit9d026054bbb21cb8b73a78693bc3d89649c869e3 (patch)
treea4a0c34e57234b70a5ed34b53ca3cb53aa4a6cb9
parentd703dbd21b2c8bffc1fde9ed664ea1a6b702894d (diff)
downloaddrakx-9d026054bbb21cb8b73a78693bc3d89649c869e3.tar
drakx-9d026054bbb21cb8b73a78693bc3d89649c869e3.tar.gz
drakx-9d026054bbb21cb8b73a78693bc3d89649c869e3.tar.bz2
drakx-9d026054bbb21cb8b73a78693bc3d89649c869e3.tar.xz
drakx-9d026054bbb21cb8b73a78693bc3d89649c869e3.zip
corrected connection script creation
-rw-r--r--perl-install/network/ethernet.pm9
-rw-r--r--perl-install/network/netconnect.pm8
2 files changed, 9 insertions, 8 deletions
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();