From 9efb82d3b7aff53989de00dde29a2c6d5c422305 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 29 Jul 2004 07:42:46 +0000
Subject: use connect option or pppd in net_cnx_up, not both (to fix weird
 pppoe net_cnx_up script)

---
 perl-install/network/adsl.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 676aa0c45..5fe1fb83e 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -285,8 +285,8 @@ user "$adsl->{login}"
         set_cnx_script($netc, "adsl", join("\n",
                                              "/sbin/route del default",
                                              $modems{$adsl_device}{start},
-					     "/usr/sbin/pppd file /etc/ppp/peers/adsl $modems{$adsl_device}{pppd_options}",
-                                             $ppp_options{$adsl_type}{connect}
+                                             $ppp_options{$adsl_type}{connect} ||
+                                               "/usr/sbin/pppd file /etc/ppp/peers/adsl $modems{$adsl_device}{pppd_options}",
                                             ),
                          $ppp_options{$adsl_type}{disconnect},
                          $netc->{adsltype}
-- 
cgit v1.2.1