X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;h=1a528fa356bc0f7207dfeb4f816487ca596b7d4e;hp=f0f3144355c7d35319b9e4e2cc39f82bbbc7b29b;hb=c8ff0bdf3dd8606400cf2999c770408f1ef02d84;hpb=c4e564708b38c9863bb946778580704e48f3b8b2 diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index f0f3144..1a528fa 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -16,10 +16,13 @@ use PVE::Exception qw(raise_param_exc); use PVE::Network; use PVE::Tools; use PVE::ProcFSTools; +use PVE::JSONSchema; use Clone qw(clone); use Linux::Inotify2; use base 'Exporter'; -use JSON; +use JSON; +use Digest::SHA; +use Encode qw(encode decode); our @EXPORT_OK = qw(read_file write_file register_file); @@ -56,13 +59,11 @@ sub ccache_compute_diff { my $diff = ''; - open (TMP, "diff -b -N -u '$filename' '$shadow'|"); - - while (my $line = ) { - $diff .= $line; - } - - close (TMP); + my $cmd = ['/usr/bin/diff', '-b', '-N', '-u', $filename, $shadow]; + PVE::Tools::run_command($cmd, noerr => 1, outfunc => sub { + my ($line) = @_; + $diff .= decode('UTF-8', $line) . "\n"; + }); $diff = undef if !$diff; @@ -83,15 +84,15 @@ sub ccache_info { $cp->{$k} = $v; } $ccache->{$filename} = $cp; - } + } return ($ccache->{$filename}, $filename); } } - + $filename = $ccachemap->{$filename} if defined ($ccachemap->{$filename}); die "file '$filename' not added :ERROR" if !defined ($ccache->{$filename}); - + return ($ccache->{$filename}, $filename); } @@ -134,7 +135,7 @@ sub write_file { if (!rename($tmpname, $realname)) { my $msg = "close (rename) atomic file '$filename' failed: $!\n"; unlink $tmpname; - die $msg; + die $msg; } my $diff; @@ -167,7 +168,7 @@ sub update_file { my $code = sub { $fd = IO::File->new ($filename, "r"); - + my $new = &$update($filename, $fd, $data, @args); if (defined($new)) { @@ -215,9 +216,9 @@ sub read_file { my $parser; my ($ccinfo, $filename) = ccache_info($fileid); - + $parser = $ccinfo->{parser}; - + my $fd; my $shadow; @@ -237,7 +238,7 @@ sub read_file { if (!$fd) { $ccinfo->{version} = undef; - $ccinfo->{data} = undef; + $ccinfo->{data} = undef; $ccinfo->{diff} = undef; return undef if !$acp; } @@ -259,7 +260,7 @@ sub read_file { $ret->{data} = $ccinfo->{data}; } $ret->{changes} = $ccinfo->{diff}; - + return $full ? $ret : $ret->{data}; } @@ -292,7 +293,7 @@ sub read_file { $ret->{changes} = $ccinfo->{diff}; return $full ? $ret : $ret->{data}; -} +} sub parse_ccache_options { my ($ccinfo, %options) = @_; @@ -311,7 +312,7 @@ sub parse_ccache_options { # noclone flag for large read-only data chunks like aplinfo $ccinfo->{$opt} = $v; } elsif ($opt eq 'always_call_parser') { - # when set, we call parser even when the file does not exists. + # when set, we call parser even when the file does not exist. # this allows the parser to return some default $ccinfo->{$opt} = $v; } else { @@ -336,7 +337,7 @@ sub register_file { $ccinfo->{update} = $update; parse_ccache_options($ccinfo, %options); - + if ($options{shadow}) { $shadowfiles->{$filename} = $options{shadow}; } @@ -352,7 +353,7 @@ sub register_regex { my $uid = "$dir/$regex"; die "regular expression '$uid' already added :ERROR" if defined ($ccacheregex->{$uid}); - + my $ccinfo = {}; $ccinfo->{dir} = $dir; @@ -416,7 +417,7 @@ sub inotify_init { foreach my $uid (keys %$ccacheregex) { my $ccinfo = $ccacheregex->{$uid}; - $dirhash->{$ccinfo->{dir}}->{_regex} = 1; + $dirhash->{$ccinfo->{dir}}->{_regex} = 1; } $inotify_pid = $$; @@ -446,7 +447,7 @@ sub inotify_init { syslog ('err', "got 'unmount' event on '$name' - disabling inotify"); $inotify = undef; } - if ($e->IN_IGNORED) { + if ($e->IN_IGNORED) { syslog ('err', "got 'ignored' event on '$name' - disabling inotify"); $inotify = undef; } @@ -479,7 +480,7 @@ sub inotify_init { next if $dir ne $ccinfo->{dir}; my $re = $ccinfo->{regex}; if (my $fd = IO::Dir->new ($dir)) { - while (defined(my $de = $fd->read)) { + while (defined(my $de = $fd->read)) { if ($de =~ m/^$re$/) { my $fn = "$dir/$de"; $versions->{$fn}++; # init with version @@ -534,10 +535,58 @@ sub write_etc_hostname { return $hostname; } -register_file('hostname', "/etc/hostname", - \&read_etc_hostname, +register_file('hostname', "/etc/hostname", + \&read_etc_hostname, \&write_etc_hostname); +sub read_etc_hosts { + my ($filename, $fh) = @_; + + my $raw = ''; + my $data = ''; + + while (my $line = <$fh>) { + $raw .= $line; + if ($line =~ m/^\s*#/) { + $line = decode('UTF-8', $line); + } + $data .= $line; + } + + return { + digest => Digest::SHA::sha1_hex($raw), + data => $data, + } +} + +sub write_etc_hosts { + my ($filename, $fh, $hosts, @args) = @_; + + # check validity of ips/names + for my $line (split("\n", $hosts)) { + next if $line =~ m/^\s*#/; # comments + next if $line =~ m/^\s*$/; # whitespace/empty lines + + my ($ip, @names) = split(/\s+/, $line); + + raise_param_exc({ 'data' => "Invalid IP '$ip'" }) + if $ip !~ m/^$PVE::Tools::IPRE$/; + + for my $name (@names) { + raise_param_exc({ 'data' => "Invalid Hostname '$name'" }) + if $name !~ m/^[.\-a-zA-Z0-9]+$/; + } + } + + die "write failed: $!" if !print $fh encode('UTF-8', $hosts); + + return $hosts; +} + +register_file('etchosts', "/etc/hosts", + \&read_etc_hosts, + \&write_etc_hosts); + sub read_etc_resolv_conf { my ($filename, $fh) = @_; @@ -580,12 +629,12 @@ sub update_etc_resolv_conf { next if $line =~ m/^(search|domain|nameserver)\s+/; $data .= $line } - + return $data; } -register_file('resolvconf', "/etc/resolv.conf", - \&read_etc_resolv_conf, undef, +register_file('resolvconf', "/etc/resolv.conf", + \&read_etc_resolv_conf, undef, \&update_etc_resolv_conf); sub read_etc_timezone { @@ -615,8 +664,8 @@ sub write_etc_timezone { } -register_file('timezone', "/etc/timezone", - \&read_etc_timezone, +register_file('timezone', "/etc/timezone", + \&read_etc_timezone, \&write_etc_timezone); sub read_active_workers { @@ -624,7 +673,7 @@ sub read_active_workers { return [] if !$fh; - my $res = []; + my $res = []; while (defined (my $line = <$fh>)) { if ($line =~ m/^(\S+)\s(0|1)(\s([0-9A-Za-z]{8})(\s(\s*\S.*))?)?$/) { my $upid = $1; @@ -668,7 +717,7 @@ sub write_active_workers { PVE::Tools::safe_print($filename, $fh, $raw) if $raw; } -register_file('active', "/var/log/pve/tasks/active", +register_file('active', "/var/log/pve/tasks/active", \&read_active_workers, \&write_active_workers); @@ -686,7 +735,7 @@ my $ovs_bond_modes = { 'active-backup' => 1, 'balance-slb' => 1, 'lacp-balance-slb' => 1, - 'lacp-balance-tcp' => 1, + 'lacp-balance-tcp' => 1, }; #sub get_bond_modes { @@ -753,6 +802,24 @@ my $extract_ovs_option = sub { return $v; }; +my $check_mtu = sub { + my ($ifaces, $parent, $child) = @_; + + die "check mtu - missing parent interface\n" if !$parent; + die "check mtu - missing child interface\n" if !$child; + + my $cmtu = $ifaces->{$child}->{mtu}; + return if !$cmtu; + + my $parentdata = $ifaces->{$parent}; + my $pmtu = $parentdata->{mtu}; + $pmtu = $cmtu if $parentdata->{type} eq 'bond' && !$pmtu; + $pmtu = 1500 if !$pmtu; + + die "interface '$parent' - mtu $pmtu is lower than '$child' - mtu $cmtu\n" + if $pmtu < $cmtu; +}; + # config => { # ifaces => { # $ifname => { @@ -829,14 +896,15 @@ sub __read_etc_network_interfaces { } # we try to keep order inside the file - my $priority = 2; # 1 is reserved for lo + my $priority = 2; # 1 is reserved for lo SECTION: while (defined ($line = <$fh>)) { chomp ($line); next if $line =~ m/^\s*#/; - - if ($line =~ m/^\s*auto\s+(.*)$/) { - my @aa = split (/\s+/, $1); + next if $line =~ m/^\s*(allow-hotplug)\s+(.*)$/; + + if ($line =~ m/^\s*(auto|allow-ovs)\s+(.*)$/) { + my @aa = split (/\s+/, $2); foreach my $a (@aa) { $ifaces->{$a}->{autostart} = 1; @@ -855,10 +923,9 @@ sub __read_etc_network_interfaces { while (defined ($line = <$fh>)) { chomp $line; if ($line =~ m/^\s*#(.*?)\s*$/) { - # NOTE: we use 'comments' instead of 'comment' to - # avoid automatic utf8 conversion $f->{comments} = '' if !$f->{comments}; - $f->{comments} .= "$1\n"; + my $comment = decode('UTF-8', $1); + $f->{comments} .= "$comment\n"; } elsif ($line =~ m/^\s*(?:iface\s |mapping\s |auto\s @@ -874,6 +941,7 @@ sub __read_etc_network_interfaces { $id = $options_alternatives->{$id} if $options_alternatives->{$id}; my $simple_options = { + 'mtu' => 1, 'ovs_type' => 1, 'ovs_options' => 1, 'ovs_bridge' => 1, @@ -888,6 +956,8 @@ sub __read_etc_network_interfaces { 'bridge-multicast-flood' => 1, 'bond_miimon' => 1, 'bond_xmit_hash_policy' => 1, + 'uplink-id' => 1, + 'vlan-protocol' => 1, 'vxlan-id' => 1, 'vxlan-svcnodeip' => 1, 'vxlan-physdev' => 1, @@ -1036,6 +1106,33 @@ sub __read_etc_network_interfaces { } } + # map address and netmask to cidr + if ($d->{address}) { + if ($d->{netmask} && $d->{netmask} =~ m/^\d+$/) { # e.g. netmask 20 + $d->{cidr} = $d->{address} . "/" . $d->{netmask}; + } elsif ($d->{netmask} && + (my $cidr = PVE::JSONSchema::get_netmask_bits($d->{netmask}))) { # e.g. netmask 255.255.255.0 + $d->{cidr} = $d->{address} . "/" . $cidr; + } elsif ($d->{address} =~ m!^(.*)/(\d+)$!) { + $d->{cidr} = $d->{address}; + $d->{address} = $1; + $d->{netmask} = $2; + } else { + $d->{cidr} = $d->{address}; + } + } + + # map address6 and netmask6 to cidr6 + if ($d->{address6}) { + $d->{cidr6} = $d->{address6}; + if ($d->{netmask6}) { + $d->{cidr6} .= "/" . $d->{netmask6}; + } elsif ($d->{address6} =~ m!^(.*)/(\d+)$!) { + $d->{address6} = $1; + $d->{netmask6} = $2; + } + } + $d->{method} = 'manual' if !$d->{method}; $d->{method6} = 'manual' if !$d->{method6}; @@ -1046,7 +1143,9 @@ sub __read_etc_network_interfaces { # from the {options} hash for them to be removed correctly. @$options = grep {defined($_)} map { my ($pri, $line) = @$_; - if ($line =~ /^allow-(\S+)\s+(.*)$/) { + if ($line =~ /^allow-ovs\s+(.*)$/) { + undef; + } elsif ($line =~ /^allow-(\S+)\s+(.*)$/) { my $bridge = $1; my @ports = split(/\s+/, $2); if (defined(my $br = $ifaces->{$bridge})) { @@ -1088,7 +1187,7 @@ sub __interface_to_string { comments => 1, autostart => 1, options => 1, address => 1, netmask => 1, gateway => 1, broadcast => 1, method6 => 1, families => 1, options6 => 1, - address6 => 1, netmask6 => 1, gateway6 => 1, broadcast6 => 1 }; + address6 => 1, netmask6 => 1, gateway6 => 1, broadcast6 => 1, 'uplink-id' => 1 }; if (!$first_block) { # not printing out options @@ -1114,7 +1213,7 @@ sub __interface_to_string { } $done->{bridge_vlan_aware} = 1; $done->{bridge_vids} = 1; - + } elsif ($d->{type} eq 'bond') { $d->{slaves} =~ s/[;,\s]+/ /g; @@ -1135,12 +1234,16 @@ sub __interface_to_string { $raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n"; } $done->{'bond_xmit_hash_policy'} = 1; + } elsif ($d->{type} eq 'vlan') { + die "$iface: wrong vlan-protocol $d->{'vlan-protocol'}\n" + if $d->{'vlan-protocol'} && $d->{'vlan-protocol'} ne '802.1ad' && $d->{'vlan-protocol'} ne '802.1q'; + } elsif ($d->{type} eq 'vxlan') { - foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) { - $raw .= "\t$k $d->{$k}\n" if $d->{$k}; + foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) { + $raw .= "\t$k $d->{$k}\n" if defined $d->{$k}; $done->{$k} = 1; - } + } if ($d->{'vxlan-remoteip'}) { foreach my $remoteip (@{$d->{'vxlan-remoteip'}}) { @@ -1154,6 +1257,7 @@ sub __interface_to_string { $done->{ovs_type} = 1; $raw .= "\tovs_ports $d->{ovs_ports}\n" if $d->{ovs_ports}; + $done->{ovs_ports} = 1; } elsif ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' || $d->{type} eq 'OVSBond') { @@ -1191,15 +1295,9 @@ sub __interface_to_string { $raw .= "\tovs_type $d->{type}\n"; $done->{ovs_type} = 1; - if ($d->{ovs_bridge}) { - - if ($ifupdown2) { - $raw = "auto $iface\n$raw"; - } else { - $raw = "allow-$d->{ovs_bridge} $iface\n$raw"; - } - - $raw .= "\tovs_bridge $d->{ovs_bridge}\n"; + if (my $bridge = $d->{ovs_bridge}) { + $raw = "allow-$bridge $iface\n$raw"; + $raw .= "\tovs_bridge $bridge\n"; $done->{ovs_bridge} = 1; } } @@ -1233,7 +1331,7 @@ sub write_etc_network_interfaces { my ($filename, $fh, $config) = @_; my $ifupdown2 = -e '/usr/share/ifupdown2'; my $raw = __write_etc_network_interfaces($config, $ifupdown2); - PVE::Tools::safe_print($filename, $fh, $raw); + PVE::Tools::safe_print($filename, $fh, encode('UTF-8', $raw)); } sub __write_etc_network_interfaces { my ($config, $ifupdown2) = @_; @@ -1246,6 +1344,9 @@ sub __write_etc_network_interfaces { foreach my $iface (keys %$ifaces) { my $d = $ifaces->{$iface}; + delete $d->{cidr}; + delete $d->{cidr6}; + my $ports = ''; foreach my $k (qw(bridge_ports ovs_ports slaves ovs_bonds)) { $ports .= " $d->{$k}" if $d->{$k}; @@ -1261,10 +1362,10 @@ sub __write_etc_network_interfaces { # delete unused OVS ports foreach my $iface (keys %$ifaces) { my $d = $ifaces->{$iface}; - if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' || + if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' || $d->{type} eq 'OVSBond') { my $brname = $used_ports->{$iface}; - if (!$brname || !$ifaces->{$brname}) { + if (!$brname || !$ifaces->{$brname}) { if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) { $ifaces->{$iface} = { type => 'eth', exists => 1, @@ -1294,13 +1395,15 @@ sub __write_etc_network_interfaces { $n->{autostart} = 0; if ($n->{type} eq 'eth') { $n->{type} = 'OVSPort'; - $n->{ovs_bridge} = $iface; + $n->{ovs_bridge} = $iface; } elsif ($n->{type} eq 'OVSBond' || $n->{type} eq 'OVSPort' || $n->{type} eq 'OVSIntPort') { $n->{ovs_bridge} = $iface; } else { die "interface '$p' is not defined as OVS port/bond\n"; } + + &$check_mtu($ifaces, $iface, $p); } } } @@ -1315,6 +1418,7 @@ sub __write_etc_network_interfaces { if !$n; die "OVS bond '$iface' - wrong interface type on slave '$p' " . "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth'; + &$check_mtu($ifaces, $iface, $p); } } } @@ -1330,6 +1434,7 @@ sub __write_etc_network_interfaces { if !$n; die "bond '$iface' - wrong interface type on slave '$p' " . "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth'; + &$check_mtu($ifaces, $iface, $p); } } } @@ -1341,7 +1446,7 @@ sub __write_etc_network_interfaces { if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) { my $vxlanid = $d->{'vxlan-id'}; - die "iface $iface : duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid}; + die "iface $iface - duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid}; $vxlans->{$vxlanid} = $iface; } @@ -1350,12 +1455,13 @@ sub __write_etc_network_interfaces { ++$ips if defined $d->{'vxlan-remoteip'}; ++$ips if defined $d->{'vxlan-local-tunnelip'}; if ($ips > 1) { - die "ifac $iface : vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n"; + die "iface $iface - vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n"; } if (defined($d->{'vxlan-svcnodeip'}) != defined($d->{'vxlan-physdev'})) { - die "iface $iface : vxlan-svcnodeip and vxlan-physdev must be define together\n"; + die "iface $iface - vxlan-svcnodeip and vxlan-physdev must be define together\n"; } + #fixme : check if vxlan mtu is lower than 50bytes than physical interface where tunnel is going out } # check vlan @@ -1366,14 +1472,30 @@ sub __write_etc_network_interfaces { my $n = $ifaces->{$p}; die "vlan '$iface' - unable to find parent '$p'\n" - if $n->{exists} eq 0; + if !$n; - if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) { - die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n"; - } elsif ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond') { + if ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond' && $n->{type} ne 'vlan') { die "vlan '$iface' - wrong interface type on parent '$p' " . - "('$n->{type}' != 'eth|bond|bridge' )\n"; + "('$n->{type}' != 'eth|bond|bridge|vlan' )\n"; } + + &$check_mtu($ifaces, $p, $iface); + + } + } + + # check uplink + my $uplinks = {}; + foreach my $iface (keys %$ifaces) { + my $d = $ifaces->{$iface}; + if (my $uplinkid = $d->{'uplink-id'}) { + die "iface '$iface' - uplink-id $uplinkid is only allowed on physical and linux bond interfaces\n" + if $d->{type} ne 'eth' && $d->{type} ne 'bond'; + + die "iface '$iface' - uplink-id $uplinkid is already assigned on '$uplinks->{$uplinkid}'\n" + if $uplinks->{$uplinkid}; + + $uplinks->{$uplinkid} = $iface; } } @@ -1384,9 +1506,15 @@ sub __write_etc_network_interfaces { my $d = $ifaces->{$iface}; if ($d->{type} eq 'bridge') { foreach my $p (split (/\s+/, $d->{bridge_ports})) { + $p =~ s/\.\d+$//; my $n = $ifaces->{$p}; die "bridge '$iface' - unable to find bridge port '$p'\n" if !$n; + die "iface $p - ip address can't be set on interface if bridged in $iface\n" + if ($n->{method} eq 'static' && $n->{address} ne '0.0.0.0') || + ($n->{method6} eq 'static' && $n->{address} ne "\:\:"); + + &$check_mtu($ifaces, $iface, $p); $bridgeports->{$p} = $iface; } $bridges->{$iface} = $d; @@ -1397,12 +1525,12 @@ sub __write_etc_network_interfaces { my $d = $ifaces->{$iface}; foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) { - die "iface $iface : bridgeports options can be used only if interface is in a bridge\n" + die "iface $iface - $k: bridge port specific options can be used only on interfaces attached to a bridge\n" if $d->{$k} && !$bridgeports->{$iface}; } if ($d->{'bridge-access'} && !$bridges->{$bridgeports->{$iface}}->{bridge_vlan_aware}) { - die "iface $iface : bridge-access option can be only used if interface is in a vlan aware bridge\n"; + die "iface $iface - bridge-access option can be only used if interface is in a vlan aware bridge\n"; } } @@ -1411,10 +1539,10 @@ sub __write_etc_network_interfaces { # Please do NOT modify this file directly, unless you know what # you're doing. # -# If you want to manage part of the network configuration manually, +# If you want to manage parts of the network configuration manually, # please utilize the 'source' or 'source-directory' directives to do # so. -# PVE will preserve these directives, but will NOT its network +# PVE will preserve these directives, but will NOT read its network # configuration from sourced files, so do not attempt to move any of # the PVE managed interfaces into external files! @@ -1425,30 +1553,23 @@ NETWORKDOC my $if_type_hash = { loopback => 100000, eth => 200000, + OVSPort => 200000, + OVSIntPort => 200000, bond => 300000, bridge => 400000, + OVSBridge => 400000, vxlan => 500000, }; my $lookup_type_prio = sub { - my $iface = shift; + my ($iface, $ifaces) = @_; - my $child = 0; - if ($iface =~ m/^(\S+)(\.|:)\d+$/) { - $iface = $1; - $child = 1; - } + my ($rootiface, @rest) = split(/[.:]/, $iface); + my $childlevel = scalar(@rest); + my $n = $ifaces->{$rootiface}; - my $pri; - if ($iface eq 'lo') { - $pri = $if_type_hash->{loopback}; - } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) { - $pri = $if_type_hash->{eth} + $child; - } elsif ($iface =~ m/^bond\d+$/) { - $pri = $if_type_hash->{bond} + $child; - } elsif ($iface =~ m/^vmbr\d+$/) { - $pri = $if_type_hash->{bridge} + $child; - } + my $pri = $if_type_hash->{$n->{type}} + $childlevel + if $n->{type} && $n->{type} ne 'unknown'; return $pri; }; @@ -1456,8 +1577,8 @@ NETWORKDOC foreach my $iface (sort { my $ref1 = $ifaces->{$a}; my $ref2 = $ifaces->{$b}; - my $tp1 = &$lookup_type_prio($a); - my $tp2 = &$lookup_type_prio($b); + my $tp1 = &$lookup_type_prio($a, $ifaces); + my $tp2 = &$lookup_type_prio($b, $ifaces); # Only recognized types are in relation to each other. If one type # is unknown then only consider the interfaces' priority attributes. @@ -1471,7 +1592,6 @@ NETWORKDOC return $a cmp $b; } keys %$ifaces) { next if $printed->{$iface}; - my $d = $ifaces->{$iface}; my $pri = $d->{priority} // 0; if (@options && $options[0]->[0] < $pri) { @@ -1482,7 +1602,15 @@ NETWORKDOC } $printed->{$iface} = 1; - $raw .= "auto $iface\n" if $d->{autostart}; + if ($d->{autostart}) { + if ($d->{type} eq 'OVSBridge') { + # cannot use 'auto' for OVS, would add race with systemd ifup@.service + $raw .= "allow-ovs $iface\n"; + } else { + $raw .= "auto $iface\n"; + } + } + my $i = 0; # some options should be printed only once $raw .= __interface_to_string($iface, $d, $_, !$i++, $ifupdown2) foreach @{$d->{families}}; } @@ -1508,7 +1636,7 @@ sub read_iscsi_initiatorname { return 'undefined'; } -register_file('initiatorname', "/etc/iscsi/initiatorname.iscsi", +register_file('initiatorname', "/etc/iscsi/initiatorname.iscsi", \&read_iscsi_initiatorname); sub read_apt_auth { @@ -1520,7 +1648,7 @@ sub read_apt_auth { $raw =~ s/^\s+//; - + my @tokens = split(/\s+/, $raw); my $data = {}; @@ -1561,7 +1689,7 @@ sub write_apt_auth { my $raw = &$format_apt_auth_data($data); die "write failed: $!" unless print $fh "$raw\n"; - + return $data; } @@ -1577,7 +1705,7 @@ sub update_apt_auth { return &$format_apt_auth_data($orig); } -register_file('apt-auth', "/etc/apt/auth.conf", +register_file('apt-auth', "/etc/apt/auth.conf", \&read_apt_auth, \&write_apt_auth, \&update_apt_auth, perm => 0640);