From bf82b11e69dee16427bcd11c9a01ad66843b3484 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 12 Jan 2004 11:44:57 +0000
Subject: list ppp interfaces too when offering to delete an interface

---
 perl-install/standalone/drakconnect | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/standalone')

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)
                              )
                          },
                         },
-- 
cgit v1.2.1