diff options
| -rw-r--r-- | perl-install/network/network.pm | 8 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/net_monitor | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 75dcedf8d..5676fb999 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -91,20 +91,20 @@ sub write_resolv_conf { my (%search, %dns, @unknown); local *F; open F, $file; local $_; - my $options; +#- my $options; while (<F>) { - if (/^[\s]*(options\s+[^#]*).*$/) { $options = $1; $options =~ s/timeout:\d+/timeout:1/; next } +#- if (/^[\s]*(options\s+[^#]*).*$/) { $options = $1; $options =~ s/timeout:\d+/timeout:1/; next } /^[#\s]*search\s+(.*?)\s*$/ and $search{$1} = $., next; /^[#\s]*nameserver\s+(.*?)\s*$/ and $dns{$1} = $., next; /^.*# ppp temp entry\s*$/ and next; /^[#\s]*(\S.*?)\s*$/ and push @unknown, $1; } - $options ||= "options timeout:1"; +#- $options ||= "options timeout:1"; close F; open F, ">$file" or die "cannot write $file: $!"; print F "# search $_\n" foreach grep { $_ ne "$netc->{DOMAINNAME} $netc->{DOMAINNAME2}" } sort { $search{$a} <=> $search{$b} } keys %search; print F "search $netc->{DOMAINNAME} $netc->{DOMAINNAME2}\n" if ($netc->{DOMAINNAME} || $netc->{DOMAINNAME2}); - print F "$options\n\n"; +#- print F "$options\n\n"; print F "# nameserver $_\n" foreach grep { ! exists $used_dns{$_} } sort { $dns{$a} <=> $dns{$b} } keys %dns; print F "nameserver $_\n" foreach sort { $used_dns{$a} <=> $used_dns{$b} } grep { $_ } keys %used_dns; print F "\n"; diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index 4f21f97d1..bfc70118a 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -343,7 +343,7 @@ $window1->show_all(); $_->hide foreach ($button1, $button3); Gtk->main_iteration while Gtk->events_pending; $::isEmbedded and kill USR2, $::CCPID; -my $tag = Gtk->timeout_add(10000, \&update); +my $tag = Gtk->timeout_add(15000, \&update); Gtk->main; Gtk->exit(0); diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 6dc90d224..bc37802c5 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -161,7 +161,7 @@ $statusbar->push(1, _("Not connected")); $window1->show_all(); #$window1->set_policy (1, 1, 1); my $time_tag = Gtk->timeout_add(1000, \&rescan); -my $time_tag2 = Gtk->timeout_add(5000, \&update); +my $time_tag2 = Gtk->timeout_add(15000, \&update); update(); rescan(); connection() if ($connect && !$isconnected); |