]> git.proxmox.com Git - pve-container.git/commitdiff
cleanup gateway hooks in debian network setup
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Mon, 2 May 2016 13:41:14 +0000 (15:41 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Tue, 3 May 2016 05:18:10 +0000 (07:18 +0200)
remove the calls to "ip route" in post-up and pre-down even
if no new gateway was defined for an interface, otherwise
those hooks will remain until manually removed.

src/PVE/LXC/Setup/Debian.pm

index d803949e1355184889ac7ab8843252889249fa64..c6b299816d1396ab8058b2e4e76a8c499ffabc8f 100644 (file)
@@ -202,8 +202,9 @@ sub setup_network {
                $interfaces .= "iface $ifname inet static\n";
                $interfaces .= "\taddress $net->{address}\n" if defined($net->{address});
                $interfaces .= "\tnetmask $net->{netmask}\n" if defined($net->{netmask});
+
+               remove_gateway_scripts($section->{attr});
                if (defined(my $gw = $net->{gateway})) {
-                   remove_gateway_scripts($section->{attr});
                    if ($net->{needsroute}) {
                        $interfaces .= make_gateway_scripts($ifname, $gw);
                    } else {
@@ -226,8 +227,8 @@ sub setup_network {
                $interfaces .= "iface $ifname inet6 static\n";
                $interfaces .= "\taddress $net->{address6}\n" if defined($net->{address6});
                $interfaces .= "\tnetmask $net->{netmask6}\n" if defined($net->{netmask6});
+               remove_gateway_scripts($section->{attr});
                if (defined(my $gw = $net->{gateway6})) {
-                   remove_gateway_scripts($section->{attr});
                    if ($net->{needsroute6}) {
                        $interfaces .= make_gateway_scripts($ifname, $gw);
                    } else {