summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2002-08-27 16:58:54 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2002-08-27 16:58:54 +0000
commita5dad137cbdff67109fd61b1367ae5f13d531d7a (patch)
tree23a7b5cb2e91549f452a2b8b7c615845a63ccabb
parentd3a1c1b92ee65675587af0f70970ee3c296ead19 (diff)
downloaddrakx-a5dad137cbdff67109fd61b1367ae5f13d531d7a.tar
drakx-a5dad137cbdff67109fd61b1367ae5f13d531d7a.tar.gz
drakx-a5dad137cbdff67109fd61b1367ae5f13d531d7a.tar.bz2
drakx-a5dad137cbdff67109fd61b1367ae5f13d531d7a.tar.xz
drakx-a5dad137cbdff67109fd61b1367ae5f13d531d7a.zip
*** empty log message ***
-rw-r--r--perl-install/network/ethernet.pm2
-rw-r--r--perl-install/network/network.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 8f81e60bc..2411f5cbc 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -209,7 +209,7 @@ such as ``mybox.mylab.myco.com''."),
} else {
configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1;
}
- miscellaneousNetwork($in) or goto configureNetwork_step_1;
+ miscellaneousNetwork($in);
}
1;
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index ddbf45bc3..0cd0189a4 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -392,9 +392,9 @@ sub miscellaneousNetwork {
complete => sub {
$u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,0;
$u->{ftp_proxy} =~ m,^($|ftp://), or $in->ask_warn('', _("Proxy should be ftp://...")), return 1,1;
- return;
+ 0;
}
- );
+ ) || return;
}
sub read_all_conf {