]> git.proxmox.com Git - pve-container.git/commitdiff
config: parse_volume: don't die when noerr is set
authorFabian Ebner <f.ebner@proxmox.com>
Thu, 13 Jan 2022 11:04:04 +0000 (12:04 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Fri, 28 Jan 2022 13:31:13 +0000 (14:31 +0100)
AFAICT, the only existing callers using noerr=1 are in
__snapshot_delete_remove_drive, and in AbstractConfig's
foreach_volume_full. The former should not be affected, as unknown
keys should never make their way in there. For the latter, it makes
iterating with
    $opts = { extra_keys => ['vmstate'] }
possible while being agnostic of guest type. Previously, it would die
for LXC configs, but now the unknown key is simply skipped there.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
src/PVE/LXC/Config.pm

index 32d990c39d88bbe6d0a110eba59c8c74cbe151b8..7db023c17447ceba62df75cef8321a1b500fbc8c 100644 (file)
@@ -1191,7 +1191,9 @@ sub parse_volume {
        return $parse_ct_mountpoint_full->($class, $unused_desc, $volume_string, $noerr);
     }
 
-    die "parse_volume - unknown type: $key\n";
+    die "parse_volume - unknown type: $key\n" if !$noerr;
+
+    return;
 }
 
 sub print_volume {