summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-02-25 00:09:31 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-02-25 00:09:31 +0000
commit2a54c69f6ef4aec8c6848c9ea9add338145f6112 (patch)
treeea3b4f1af91cc275884075853115dc4d09dd9f0a
parent60fce93457027c8a6b92ce0536314b5aaf2f3dee (diff)
downloaddrakx-2a54c69f6ef4aec8c6848c9ea9add338145f6112.tar
drakx-2a54c69f6ef4aec8c6848c9ea9add338145f6112.tar.gz
drakx-2a54c69f6ef4aec8c6848c9ea9add338145f6112.tar.bz2
drakx-2a54c69f6ef4aec8c6848c9ea9add338145f6112.tar.xz
drakx-2a54c69f6ef4aec8c6848c9ea9add338145f6112.zip
- allow writting to another kppprc file
- replace new kppp option values
-rw-r--r--perl-install/network/modem.pm18
1 files changed, 10 insertions, 8 deletions
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 7d556a616..e790cf83c 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -144,7 +144,9 @@ END
#- install kppprc file according to used configuration.
mkdir_p("$::prefix/usr/share/config");
- output("$::prefix/usr/share/config/kppprc", c::to_utf8(<<END));
+ $toreplace{$_->[0]} = $modem->{$_->[0]} || $_->[1] foreach [ 'Timeout', 60 ], [ 'UseLockFile', 1 ], [ 'Enter', 'CR' ], [ 'Volume', 0 ],
+ [ 'BusyWait', 0 ], [ 'FlowControl', 'CRTSCTS' ], [ 'Speed', 115200 ];
+ output($modem->{kppprc} || "$::prefix/usr/share/config/kppprc", c::to_utf8(<<END));
# KDE Config File
[Account0]
@@ -174,15 +176,15 @@ StorePassword=1
DisconnectCommand=
[Modem]
-BusyWait=0
-Enter=CR
-FlowControl=CRTSCTS
-Volume=0
-Timeout=60
+BusyWait=$toreplace{BusyWait}
+Enter=$toreplace{Enter}
+FlowControl=$toreplace{FlowControl}
+Volume=$toreplace{Volume}
+Timeout=$toreplace{Timeout}
UseCDLine=0
-UseLockFile=1
+UseLockFile=$toreplace{UseLockFile}
Device=/dev/modem
-Speed=115200
+Speed=$toreplace{Speed}
[Graph]
InBytes=0,0,255