From 25946f2b1829f207aab844f3464ce515a50f15cc Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 25 Apr 2000 16:12:35 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps.pm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 6ba1ebb13..363149d52 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -477,9 +477,11 @@ sub pppConfig {
 	do { $replaced ||= 1
 	       if s/^\s*$toreplace{login}\s+ppp0\s+(\S+)/$toreplace{login}  ppp0  $toreplace{passwd}/; } foreach @l;
 	if ($replaced) {
+	    local *F;
 	    open F, ">$o->{prefix}/etc/ppp/pap-secrets" or die "Can't open $o->{prefix}/etc/ppp/pap-secrets $!";
 	    print F @l;
 	} else {
+	    local *F;
 	    open F, ">>$o->{prefix}/etc/ppp/pap-secrets" or die "Can't open $o->{prefix}/etc/ppp/pap-secrets $!";
 	    print F "$toreplace{login}  ppp0  $toreplace{passwd}\n";
 	}
@@ -843,12 +845,12 @@ sub generateAutoInstFloppy($) {
 
 #------------------------------------------------------------------------------
 sub upNetwork {
-    my ($o) = @_;
+    my ($o, $pppAvoided) = @_;
 
     modules::write_conf("$o->{prefix}/etc/conf.modules");
     if ($o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
 	network::up_it($o->{prefix}, $o->{intf});
-    } elsif ($o->{modem} && !$o->{modem}{isUp}) {
+    } elsif (!$pppAvoided && $o->{modem} && !$o->{modem}{isUp}) {
 	run_program::rooted($o->{prefix}, "ifup", "ppp0");
 	$o->{modem}{isUp} = 1;
     } else {
@@ -857,6 +859,22 @@ sub upNetwork {
     1;
 }
 
+#------------------------------------------------------------------------------
+sub downNetwork {
+    my ($o, $pppOnly) = @_;
+
+    modules::write_conf("$o->{prefix}/etc/conf.modules");
+    if (!$pppOnly && $o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
+	network::down_it($o->{prefix}, $o->{intf});
+    } elsif ($o->{modem} && $o->{modem}{isUp}) {
+	run_program::rooted($o->{prefix}, "ifup", "ppp0");
+	$o->{modem}{isUp} = 0;
+    } else {
+	$::testing or return;
+    }
+    1;
+}
+
 #------------------------------------------------------------------------------
 sub cleanIfFailedUpgrade($) {
     my ($o) = @_;
-- 
cgit v1.2.1