diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-10-12 02:19:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-10-12 02:19:48 +0000 |
| commit | c1090119c90ae34b9dc99b2a63e8538a46e02750 (patch) | |
| tree | 1d145f8946700d82f6891659a7bde08e0491c1ec | |
| parent | 5257a4b51da873ea3f3b5e25e7822930f6433489 (diff) | |
| download | drakx-backup-do-not-use-c1090119c90ae34b9dc99b2a63e8538a46e02750.tar drakx-backup-do-not-use-c1090119c90ae34b9dc99b2a63e8538a46e02750.tar.gz drakx-backup-do-not-use-c1090119c90ae34b9dc99b2a63e8538a46e02750.tar.bz2 drakx-backup-do-not-use-c1090119c90ae34b9dc99b2a63e8538a46e02750.tar.xz drakx-backup-do-not-use-c1090119c90ae34b9dc99b2a63e8538a46e02750.zip | |
(del_intf) fix crash introduced by trainee just before the release :-(
| -rwxr-xr-x | perl-install/standalone/drakconnect | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index e344d4e36..90ef8419d 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -691,17 +691,17 @@ sub del_intf() { post => sub { !$::testing and eval { if (member($intf2delete, qw(adsl modem))) { - rm_rf("/etc/ppp/peers/ppp0"); - rm_rf("/etc/sysconfig/network-scripts/ifcfg-ppp0"); + eval { rm_rf("/etc/ppp/peers/ppp0") }; + eval { rm_rf("/etc/sysconfig/network-scripts/ifcfg-ppp0") }; } if ($intf2delete eq 'adsl') { - rm_rf("/etc/sysconfig/network-scripts/ifcfg-sagem"); + eval { rm_rf("/etc/sysconfig/network-scripts/ifcfg-sagem") }; } elsif ($intf2delete eq 'isdn') { - rm_rf("/etc/sysconfig/network-scripts/ifcfg-ippp0"); + eval { rm_rf("/etc/sysconfig/network-scripts/ifcfg-ippp0") }; } else { system("ifdown $intf2delete"); - rm_rf("/etc/sysconfig/network-scripts/$intf2delete"); - rm_rf("/etc/sysconfig/network-scripts/ifcfg-$intf2delete"); + eval { rm_rf("/etc/sysconfig/network-scripts/$intf2delete") }; + eval { rm_rf("/etc/sysconfig/network-scripts/ifcfg-$intf2delete") }; } }; $faillure = $@; |