summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-12 11:44:57 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-12 11:44:57 +0000
commitbf82b11e69dee16427bcd11c9a01ad66843b3484 (patch)
tree49cfe8b0db1d4e9368140a4b4cc04a6aa07eb950 /perl-install
parent66e6644a89788360516adf05561f43a2199ca3a7 (diff)
downloaddrakx-bf82b11e69dee16427bcd11c9a01ad66843b3484.tar
drakx-bf82b11e69dee16427bcd11c9a01ad66843b3484.tar.gz
drakx-bf82b11e69dee16427bcd11c9a01ad66843b3484.tar.bz2
drakx-bf82b11e69dee16427bcd11c9a01ad66843b3484.tar.xz
drakx-bf82b11e69dee16427bcd11c9a01ad66843b3484.zip
list ppp interfaces too when offering to delete an interface
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/drakconnect12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index c7870c9a0..11d821bab 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -400,7 +400,7 @@ sub add_intf() {
}
sub del_intf() {
- my ($intf, $faillure);
+ my ($intf2delete, $faillure);
my $wiz =
{
defaultimage => "wiz_drakconnect.png",
@@ -409,13 +409,13 @@ sub del_intf() {
welcome => {
no_back => 1,
name => N("Select the network interface to remove:"),
- data => [ { label => N("Net Device"), val => \$intf, list => [ detect_devices::getNet() ], allow_empty_list => 1 } ],
+ data => [ { label => N("Net Device"), val => \$intf2delete, list => [ uniq(detect_devices::getNet(), keys %$intf) ], allow_empty_list => 1 } ],
post => sub {
!$::testing and eval {
modules::mergein_conf('/etc/modules.conf');
- modules::remove_alias($intf);
+ modules::remove_alias($intf2delete);
modules::write_conf();
- rm_rf("/etc/sysconfig/network-scripts/ifcfg-$intf");
+ rm_rf("/etc/sysconfig/network-scripts/ifcfg-$intf2delete");
};
$faillure = $@;
},
@@ -425,8 +425,8 @@ sub del_intf() {
name => sub {
($faillure ?
N("An error occured while deleting the \"%s\" network interface:\n\n%s",
- $intf, $faillure) :
- N("Congratulations, the \"%s\" network interface has been succesfully deleted", $intf)
+ $intf2delete, $faillure) :
+ N("Congratulations, the \"%s\" network interface has been succesfully deleted", $intf2delete)
)
},
},