summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-06-20 07:55:23 +0000
committerOlivier Blin <oblin@mandriva.org>2005-06-20 07:55:23 +0000
commit4c8726b00f6a0c1fde62caa3f3fae899f6f36aef (patch)
treec40223ca79b922834f8c33c1c76e7d21d865518f
parent24dd437935440d906f5bb842d825e5dc7dfad40b (diff)
downloaddrakx-4c8726b00f6a0c1fde62caa3f3fae899f6f36aef.tar
drakx-4c8726b00f6a0c1fde62caa3f3fae899f6f36aef.tar.gz
drakx-4c8726b00f6a0c1fde62caa3f3fae899f6f36aef.tar.bz2
drakx-4c8726b00f6a0c1fde62caa3f3fae899f6f36aef.tar.xz
drakx-4c8726b00f6a0c1fde62caa3f3fae899f6f36aef.zip
inline ask_shorewall_interface
-rw-r--r--perl-install/network/shorewall.pm9
1 files changed, 1 insertions, 8 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index ffefe6f0c..1771ea280 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -69,17 +69,10 @@ sub shorewall_interface_choices {
[ { label => N("Net Device"), val => $refval, list => [ sort keys %net_devices ], format => sub { $net_devices{$_[0]} || $_[0] }, not_edit => 0 } ];
}
-sub ask_shorewall_interface {
- my ($in, $interface) = @_;
-
- $in->ask_from('', translate($ask_shorewall_interface_label), shorewall_interface_choices(\$interface));
- $interface;
-}
-
sub read_default_interfaces {
my ($conf, $o_in) = @_;
my $interface = get_shorewall_interface();
- $o_in and $interface = ask_shorewall_interface($o_in, $interface);
+ $o_in and $o_in->ask_from('', translate($ask_shorewall_interface_label), shorewall_interface_choices(\$interface));
set_net_interface($conf, $interface);
}