fix ipset remove order

diff --git a/debian/changelog b/debian/changelog
index 1ea7a4cf969cc2795e9df42c84840b31bbae6a20..df0a283d32bed669089b2e05a2fbc5f1718e8247 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pve-firewall (1.0-12) unstable; urgency=low
 
   * add preinst script to clear ipset from older installation (because 
     sets cannot be swapped if there type does not match.
+  
+  * fix ipset remove order
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 28 Nov 2014 08:59:38 +0100
 

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index f4b199bdb7281f8ab894cdfd26b194f295e8a2bc..20759b67ff2467439b7d74924bbffc829bd22f63 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -3381,7 +3381,7 @@ sub get_ipset_cmdlist {
     # remove unused list chains first
     foreach my $chain (keys %$statushash) {
        next if $statushash->{$chain}->{action} ne 'delete';
-       next if $chain !~ m/-v[46]$/;
+       next if $chain =~ m/-v[46]$/;
 
        $delete_cmdlist .= "flush $chain\n";
        $delete_cmdlist .= "destroy $chain\n";
@@ -3390,7 +3390,7 @@ sub get_ipset_cmdlist {
     # the remove unused -v4 -v6 chains
     foreach my $chain (keys %$statushash) {
        next if $statushash->{$chain}->{action} ne 'delete';
-       next if $chain =~ m/-v[46]$/;
+       next if $chain !~ m/-v[46]$/;
 
        $delete_cmdlist .= "flush $chain\n";
        $delete_cmdlist .= "destroy $chain\n";