diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-04-26 14:31:02 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-04-26 14:31:02 +0000 |
| commit | d387e1a9abae671ab1ec086014699f800462862d (patch) | |
| tree | 886d11354ac297d6c9e892c958cdd3b3c9d44c3e | |
| parent | 5f0d2865f5e6d01e0bb4ab32d70b637518e26fa5 (diff) | |
| download | drakx-backup-do-not-use-d387e1a9abae671ab1ec086014699f800462862d.tar drakx-backup-do-not-use-d387e1a9abae671ab1ec086014699f800462862d.tar.gz drakx-backup-do-not-use-d387e1a9abae671ab1ec086014699f800462862d.tar.bz2 drakx-backup-do-not-use-d387e1a9abae671ab1ec086014699f800462862d.tar.xz drakx-backup-do-not-use-d387e1a9abae671ab1ec086014699f800462862d.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 71ae77d70..4a9e4d52b 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -468,7 +468,7 @@ sub pppConfig { $toreplace{connection} ||= 'DialupConnection'; $toreplace{domain} ||= 'localdomain'; $toreplace{intf} ||= 'ppp0'; - $toreplace{papname} = $o->{modem}{auth} eq 'PAP' && $toreplace{connection}; + $toreplace{papname} = $o->{modem}{auth} eq 'PAP' && $toreplace{login}; #- build ifcfg-ppp0. my $ifcfg = "$o->{prefix}/etc/sysconfig/network-scripts/ifcfg-ppp0"; @@ -533,13 +533,13 @@ END END close CHAT; - if ($o->{modem}{auth} eq 'PAP' || $o->{modem}{auth} eq 'CHAP') { + if ($o->{modem}{auth} eq 'PAP') { #- need to create a secrets file for the connection. my $secrets = "$o->{prefix}/etc/ppp/" . lc($o->{modem}{auth}) . "-secrets"; my @l = cat_($secrets); my $replaced = 0; do { $replaced ||= 1 - if s/^\s*$toreplace{login}\s+ppp0\s+(\S+)/$toreplace{login} ppp0 "$toreplace{passwd}"/; } foreach @l; + if s/^\s*"?$toreplace{login}"?\s+ppp0\s+(\S+)/"$toreplace{login}" ppp0 "$toreplace{passwd}"/; } foreach @l; if ($replaced) { local *F; open F, ">$secrets" or die "Can't open $secrets: $!"; @@ -551,7 +551,7 @@ END } #- restore access right to secrets file, just in case. chmod 0600, $secrets; - } + } #- CHAP is not supported by initscripts, need patching before doing more on that here! install_any::template2userfile($o->{prefix}, "$ENV{SHARE_PATH}/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace); |