network : add trunks support

[pve-common.git] / src / PVE / INotify.pm

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index a9dbf21265417d56979df15e30729135079a6ada..6cec84bc2a2a3e0e4e0aca97da660b9d896237cf 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -648,9 +648,9 @@ sub write_active_workers {
        my $saved = $task->{saved} ? 1 : 0;
        if ($task->{endtime}) {
            if ($task->{status}) {
-               $raw .= sprintf("$upid $saved %08X $task->{status}\n", $task->{endtime});
+               $raw .= sprintf("%s %s %08X %s\n", $upid, $saved, $task->{endtime}, $task->{status});
            } else {
-               $raw .= sprintf("$upid $saved %08X\n", $task->{endtime});
+               $raw .= sprintf("%s %s %08X\n", $upid, $saved, $task->{endtime});
            }
        } else {
            $raw .= "$upid $saved\n";
@@ -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};