[pve-devel] [PATCH pve-common] half-revert: remove autostart property from bridge ports

Wolfgang Bumiller w.bumiller at proxmox.com
Mon Oct 19 10:50:23 CEST 2015


In commit 21d32c95cd autostart was removed from all bridge
ports but should have only been removed from linux-bridges.
---
 src/PVE/INotify.pm                                      | 13 -------------
 test/etc_network_interfaces/t.bridge_eth_remove_auto.pl |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index a9dbf21..60610ce 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -1245,19 +1245,6 @@ sub __write_etc_network_interfaces {
 	}
     }
 
-    # Remove autostart from linux bridge ports
-    foreach my $iface (keys %$ifaces) {
-	my $d = $ifaces->{$iface};
-	if ($d->{type} eq 'bridge' && $d->{bridge_ports}) {
-	    foreach my $p (split (/\s+/, $d->{bridge_ports})) {
-		my $n = $ifaces->{$p};
-		die "bridge '$iface' - unable to find port '$p'\n"
-		    if !$n;
-		$n->{autostart} = 0;
-	    }
-	}
-    }
-
     # check OVS bond ports
     foreach my $iface (keys %$ifaces) {
 	my $d = $ifaces->{$iface};
diff --git a/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl b/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl
index 0b073d9..98f5df8 100644
--- a/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl
+++ b/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl
@@ -18,7 +18,7 @@ die "autostart lost" if !$config->{ifaces}->{eth1}->{autostart};
 new_iface("vmbr0", 'bridge', [{ family => 'inet' }], bridge_ports => 'eth0');
 new_iface("vmbr1", 'OVSBridge', [{ family => 'inet' }], ovs_ports => 'eth1');
 r(w());
-die "autostart not removed for linux bridge port" if $config->{ifaces}->{eth0}->{autostart};
+die "autostart wrongly removed for linux bridge port" if !$config->{ifaces}->{eth0}->{autostart};
 die "autostart not removed for ovs bridge port" if $config->{ifaces}->{eth1}->{autostart};
 
 1;
-- 
2.1.4




More information about the pve-devel mailing list