From dd5d80f56a14b105f5572fd31bd5732bdf9736a8 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Mon, 21 Dec 2020 14:48:16 +0100 Subject: [PATCH] vzdump: defaults: convert to prune-backups early enough Fixes the case where reading from /etc/vzdump.conf fails. Also convert the options read from /etc/vzdump.conf before the loop. That avoids showing a wrong warning when 'prune-backups' is configured in /etc/vzdump.conf, and maxfiles isn't. Previously, because 'maxfiles' from the schema defaults was automatically set, the call to parse_prune_backups_maxfiles after the loop threw the warning that both options are defined. Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 6a4e641b..f75e4b16 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -211,6 +211,7 @@ sub read_vzdump_defaults { defined($default) ? ($_ => $default) : () } keys %$confdesc }; + $parse_prune_backups_maxfiles->($defaults, "defaults in VZDump schema"); my $raw; eval { $raw = PVE::Tools::file_get_contents($fn); }; @@ -225,6 +226,7 @@ sub read_vzdump_defaults { my @mailto = split_list($res->{mailto}); $res->{mailto} = [ @mailto ]; } + $parse_prune_backups_maxfiles->($res, "options in '$fn'"); foreach my $key (keys %$defaults) { $res->{$key} = $defaults->{$key} if !defined($res->{$key}); @@ -235,8 +237,6 @@ sub read_vzdump_defaults { delete $res->{dumpdir}; } - $parse_prune_backups_maxfiles->($res, "options in '$fn'"); - return $res; }