diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-02 15:29:41 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-02 15:29:41 +0000 |
| commit | 494ffe2fc2f6a29aa74994ab53a53e3b074e67f6 (patch) | |
| tree | 1cbb4eab09138508fa5099036fa11e103b868594 | |
| parent | c367a7b536cbc28a666370a8935718980bdc5ee3 (diff) | |
| download | drakx-494ffe2fc2f6a29aa74994ab53a53e3b074e67f6.tar drakx-494ffe2fc2f6a29aa74994ab53a53e3b074e67f6.tar.gz drakx-494ffe2fc2f6a29aa74994ab53a53e3b074e67f6.tar.bz2 drakx-494ffe2fc2f6a29aa74994ab53a53e3b074e67f6.tar.xz drakx-494ffe2fc2f6a29aa74994ab53a53e3b074e67f6.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 4ed27fb1e..49d6ff677 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -928,6 +928,8 @@ sub upNetwork { if ($o->{intf} && $o->{netc}{NETWORKING} ne 'false') { network::up_it($o->{prefix}, $o->{intf}); } elsif (!$pppAvoided && $o->{modem} && !$o->{modem}{isUp}) { + eval { modules::load_multi(qw(serial ppp)) }; + run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/syslog", "start"); run_program::rooted($o->{prefix}, "ifup", "ppp0"); $o->{modem}{isUp} = 1; } else { @@ -944,7 +946,9 @@ sub downNetwork { 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"); + run_program::rooted($o->{prefix}, "ifdown", "ppp0"); + run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/syslog", "stop"); + eval { modules::unload($_) foreach qw(ppp serial) }; $o->{modem}{isUp} = 0; } else { $::testing or return; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 6df194793..f35ab94a4 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -514,10 +514,10 @@ _("Login ID") => \$m->{login}, _("Password") => { val => \$m->{passwd}, hidden => 1 }, _("Authentication") => { val => \$m->{auth}, list => [ __("PAP"), __("CHAP"), __("Terminal-based"), __("Script-based") ] }, _("Domain name") => \$m->{domain}, -$::expert ? ( +#-$::expert ? ( #- It is not apropriate to remove DNS as kppp need them! only available for "ifup ppp0" _("First DNS Server") => \$m->{dns1}, _("Second DNS Server") => \$m->{dns2}, -) : (), +#-) : (), ]); } |