proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-24 20:52:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

write_network_interfaces: improved sorting

Browse Source 
This way option line positions between interfaces can be
preserved.
This commit is contained in:
Wolfgang Bumiller 2015-06-25 11:54:33 +02:00 committed by Dietmar Maurer
parent 11e7facb94
commit 562fad0bab
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/PVE/INotify.pm
View File

@ -1261,10 +1261,10 @@ NETWORKDOC
my $if_type_hash = {
unknown => 0,
loopback => 10,
eth => 20,
bond => 30,
bridge => 40,
loopback => 100000,
eth => 200000,
bond => 300000,
bridge => 400000,
};
my $lookup_type_prio = sub {
@ -1296,10 +1296,8 @@ NETWORKDOC
my $p1 = &$lookup_type_prio($a);
my $p2 = &$lookup_type_prio($b);
return $p1 <=> $p2 if $p1 != $p2;
$p1 = $ref1->{priority} || 100000;
$p2 = $ref2->{priority} || 100000;
$p1 += $ref1->{priority} // 50000;
$p2 += $ref2->{priority} // 50000;
return $p1 <=> $p2 if $p1 != $p2;
@ -1308,10 +1306,11 @@ NETWORKDOC
next if $printed->{$iface};
my $d = $ifaces->{$iface};
if (@options && $options[0]->[0] < $d->{priority}) {
my $pri = $d->{priority} // 0;
if (@options && $options[0]->[0] < $pri) {
do {
$raw .= (shift @options)->[1] . "\n";
} while (@options && $options[0]->[0] < $d->{priority});
} while (@options && $options[0]->[0] < $pri);
$raw .= "\n";
}