diff options
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/drakconnect | 42 | ||||
| -rwxr-xr-x | perl-install/standalone/drakgw | 9 |
2 files changed, 25 insertions, 26 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 181527f46..00051fdee 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -68,7 +68,7 @@ local $_ = join '', @ARGV; /--old/ and goto old; if (/--install/) { $::isInstall = 1; - add_intf() + add_intf(); } /--internet/ and configure_net($netcnx, $netc, $intf); @@ -275,7 +275,7 @@ sub build_tree { $intf->{save} = sub { $netc->{internet_cnx_choice} = 'adsl'; $netc->{at_boot} = $intf->{ONBOOT} eq 'yes' ? 1 : 0; - network::adsl::adsl_conf_backend($in, $modules_conf, $netcnx, $netc, $intf, $interface_name, $protocol) + network::adsl::adsl_conf_backend($in, $modules_conf, $netcnx, $netc, $intf, $interface_name, $protocol); }; } elsif ($interface eq 'modem') { @@ -309,13 +309,15 @@ sub build_notebook { Gtk2::Label->new(N("Protocol")), $gui->{intf}{BOOTPROTO} = gtksignal_connect(Gtk2::ComboBox->new_text, changed => sub { - return if !$_[0]->realized; - my $proto = $gui->{intf}{BOOTPROTO}; - my $protocol = $intf->{BOOTPROTO} = { reverse %{$proto->{protocols}} }->{$proto->get_text}; - - foreach ($gui->{intf}{IPADDR}, $gui->{intf}{NETMASK}, $gui->{netc}{GATEWAY}) { - $_->set_sensitive($protocol eq "static" ? 1 : 0) - }; $apply->() }, + return if !$_[0]->realized; + my $proto = $gui->{intf}{BOOTPROTO}; + my $protocol = $intf->{BOOTPROTO} = { reverse %{$proto->{protocols}} }->{$proto->get_text}; + + foreach ($gui->{intf}{IPADDR}, $gui->{intf}{NETMASK}, $gui->{netc}{GATEWAY}) { + $_->set_sensitive($protocol eq "static" ? 1 : 0); + } + $apply->(); + }, ), ), ), @@ -359,8 +361,8 @@ sub build_notebook { $proto->set_popdown_strings(values %{$proto->{protocols}}); $proto->set_text($proto->{protocols}{$intf->{BOOTPROTO} || 'none'}); foreach ($gui->{intf}{IPADDR}, $gui->{intf}{NETMASK}, $gui->{netc}{GATEWAY}) { - $_->set_sensitive($intf->{BOOTPROTO} eq 'static' ? 1 : 0) - }; + $_->set_sensitive($intf->{BOOTPROTO} eq 'static' ? 1 : 0); + } } else { $_->set_sensitive(0) foreach $gui->{intf}{IPADDR}, $gui->{intf}{NETMASK}; delete $gui->{intf}{BOOTPROTO}; @@ -487,7 +489,7 @@ sub build_notebook { gtkpack__(Gtk2::HBox->new, $gui->{intf}{$_->[1]} = gtksignal_connect(Gtk2::ComboBox->new_text, changed => $apply)), ), - ), + ) } ([ N("Flow control"), 'FlowControl' ], [ N("Line termination"), 'Enter' ], [ N("Connection speed"), 'Speed' ], @@ -684,7 +686,7 @@ sub del_intf() { list => [ keys %$intf ], format => sub { my $type = network::tools::get_interface_type($intf->{$_[0]}); - $ethernet_names{$_[0]} || ($type ? "$type ($_[0])" : $_[0]) + $ethernet_names{$_[0]} || ($type ? "$type ($_[0])" : $_[0]); } } ], @@ -710,11 +712,9 @@ sub del_intf() { }, end => { name => sub { - ($faillure ? - N("An error occurred while deleting the \"%s\" network interface:\n\n%s", - $intf2delete, $faillure) : - N("Congratulations, the \"%s\" network interface has been successfully deleted", $intf2delete) - ) + $faillure ? + N("An error occurred while deleting the \"%s\" network interface:\n\n%s", $intf2delete, $faillure) + : N("Congratulations, the \"%s\" network interface has been successfully deleted", $intf2delete); }, end => 1, }, @@ -771,7 +771,7 @@ sub apply { } sub ethisup { `LC_ALL=C LANGUAGE=C /sbin/ifconfig $_[0]` =~ /inet/ } -sub chk_internet() { `LC_ALL=C LANGUAGE=C /sbin/chkconfig --list | grep internet` =~ /:on/ ? 1 : 0 }; +sub chk_internet() { `LC_ALL=C LANGUAGE=C /sbin/chkconfig --list | grep internet` =~ /:on/ ? 1 : 0 } sub update_intbutt() { $int_state->set($isconnected ? N("Connected") : N("Not connected")); @@ -836,7 +836,7 @@ sub quit_global() { sub get_intf_status { my ($c) = @_; - ethisup($c) ? N("Deactivate now") : N("Activate now") + ethisup($c) ? N("Deactivate now") : N("Activate now"); } sub configure_lan() { @@ -1036,7 +1036,7 @@ Run the \"Add Connection\" assistant from the Mandrakelinux Control Center")); gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { foreach my $i (0..$#conf_data) { ${$conf_data[$i][1]} = $infos[2*$i+1]->get_text; - }; + } # called from old GUI? if ($label_host) { update(); diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index d00cba315..34d8a5b99 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -81,7 +81,6 @@ sub start_daemons () { system("/etc/rc.d/init.d/squid status >/dev/null") == 0 and sys("/etc/rc.d/init.d/squid stop"); system("/etc/rc.d/init.d/named status >/dev/null 2>/dev/null") == 0 and sys("/etc/rc.d/init.d/named stop"); - my $netscripts = '/etc/sysconfig/network-scripts'; sys("/etc/rc.d/init.d/network restart >/dev/null"); sys("/etc/rc.d/init.d/$_ start >/dev/null"), sys("/sbin/chkconfig --level 345 $_ on") foreach 'named', 'dhcpd', 'squid'; @@ -130,7 +129,7 @@ What would you like to do?"), foreach ($dhcpd_conf, $squid_conf, $masq_file) { rename($_, "$_.old") if -f $_; rename("$_.drakgwdisable", $_) or die "Could not find configuration. Please reconfigure."; - }; + } { my $_wait_enabl = $in->wait_message('', N("Enabling servers...")); start_daemons(); @@ -159,7 +158,7 @@ What would you like to do?"), stop_daemons(); } foreach ($dhcpd_conf, $squid_conf, $masq_file) { - if (-f $_) { rename($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable" }; + if (-f $_) { rename($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable" } } print "remove rules entries\n"; substInFile { @@ -227,7 +226,7 @@ Examples: my @cards = grep { log::l("[drakgw] Have network card: $_"); - $_ ne $card_netconnect + $_ ne $card_netconnect; } detect_devices::getNet(); push @cards, $card_netconnect if $::testing; log::l("[drakgw] Available network cards: ", join(", ", @cards)); @@ -607,5 +606,5 @@ quit_global($in, 0); sub quit_global { my ($in, $exitcode) = @_; $in->exit($exitcode); - goto begin + goto begin; } |