summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-13 14:22:17 +0000
committerdamien <damien@mandriva.com>2001-09-13 14:22:17 +0000
commite0ac85418b44a743681d297f1b03e64bc7c13c0f (patch)
tree0a63abeb374820f8855cd2b394fa707893a83614
parent90b998d0718fa02f1fc4b33e42cbe8fcec06e5a5 (diff)
downloaddrakx-e0ac85418b44a743681d297f1b03e64bc7c13c0f.tar
drakx-e0ac85418b44a743681d297f1b03e64bc7c13c0f.tar.gz
drakx-e0ac85418b44a743681d297f1b03e64bc7c13c0f.tar.bz2
drakx-e0ac85418b44a743681d297f1b03e64bc7c13c0f.tar.xz
drakx-e0ac85418b44a743681d297f1b03e64bc7c13c0f.zip
isdn timeout works now.
-rw-r--r--perl-install/network/isdn.pm5
-rwxr-xr-xperl-install/standalone/draknet2
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 006cbca23..dc2d11b50 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -89,8 +89,9 @@ sub isdn_write_config_backend {
substInFile {
s/EAZ =.*/EAZ = $isdn->{phone_in}/;
s/PHONE_OUT =.*/PHONE_OUT = $isdn->{phone_out}/;
-# s/HUPTIMEOUT =.*/HUPTIMEOUT = $isdn->{huptimeout}/;
-# $a or s/HUPTIMEOUT =.*/HUPTIMEOUT = $isdn->{huptimeout}/, $a=1;
+ if (/NAME = ippp0/ .. /PPPBIND = 0/) {
+ s/HUPTIMEOUT =.*/HUPTIMEOUT = $isdn->{huptimeout}/;
+ }
} "$prefix/etc/isdn/$f";
chmod 0600, $f;
}
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 1ddca557b..7177f6e5f 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -601,7 +601,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
[_("Ethernet Card"), \$netc->{NET_DEVICE}, [ 'eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5','eth6', 'eth7', 'eth8', 'eth9' ]],
[_("DHCP Client"), \$netcnx->{dhcp_client}, ["dhcpcd", "dhcpxd", "dhcp-client"] ],
[_("Connection speed"), \$cnx->{speed}, ["64 Kb/s", "128 Kb/s"]],
- [_("Connection timeout (in sec) [ beta, not yet implemented ]"), \$cnx->{huptimeout} ]
+ [_("Connection timeout (in sec)"), \$cnx->{huptimeout} ]
);
foreach (@conf_data) {
$infos[2*$i]=new Gtk::HBox(0,0);