summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-29 13:16:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-29 13:16:00 +0000
commit008c48568c58665dcd4542f653f69bded0187dea (patch)
tree20a0b718d60a3a41d7a1bb9c3f3aa4d8beeef445
parent6f5f36a66dee94da10f3e342f608328ad0acaa06 (diff)
downloaddrakx-008c48568c58665dcd4542f653f69bded0187dea.tar
drakx-008c48568c58665dcd4542f653f69bded0187dea.tar.gz
drakx-008c48568c58665dcd4542f653f69bded0187dea.tar.bz2
drakx-008c48568c58665dcd4542f653f69bded0187dea.tar.xz
drakx-008c48568c58665dcd4542f653f69bded0187dea.zip
small cleanup (thanks to perl_checker)
!! default_interfaces() is still wrong !!
-rw-r--r--perl-install/network/shorewall.pm13
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 489beb8d6..d6e88eb4e 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -46,8 +46,8 @@ sub get_config_file {
map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix/etc/shorewall/$file");
}
-sub default_interfaces_silent($) {
- my ($in) = @_;
+sub default_interfaces_silent {
+ my ($_in) = @_;
my %conf;
my @l = detect_devices::getNet() or return;
if (@l == 1) {
@@ -59,7 +59,7 @@ sub default_interfaces_silent($) {
\%conf;
}
-sub default_interfaces($) {
+sub default_interfaces {
my ($in) = @_;
my %conf;
my $card_netconnect = network::netconnect::get_net_device() || "eth0";
@@ -88,10 +88,9 @@ Examples:
\%conf;
}
-sub read($$) {
- my %conf;
- my ($in,$mode) = @_;
- $conf{disabled} = !glob_("$::prefix/etc/rc3.d/S*shorewall");
+sub read {
+ my ($in, $mode) = @_;
+ my %conf = { disabled => !glob_("$::prefix/etc/rc3.d/S*shorewall") };
$conf{ports} =
join(' ', map {