From: Peter Krempa Date: Thu, 9 Apr 2020 13:25:35 +0000 (+0200) Subject: virsh: cmdUndefine: Properly extract delete-storage-volume-snapshots flag X-Git-Tag: v6.3.0-rc1~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33046f3c3394a6c151b82c6c187e7fb5bc60065;p=thirdparty%2Flibvirt.git virsh: cmdUndefine: Properly extract delete-storage-volume-snapshots flag Commit 86608f787ee added the above flag as an alias for ambiguous 'delete-snapshots' flag, but forgot to actually change the code that extracts it, thus the new version actually doesn't work. https://bugzilla.redhat.com/show_bug.cgi?id=1821988 Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2dc7c38b55..d52eb7bc2f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3658,7 +3658,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) bool checkpoints_metadata = vshCommandOptBool(cmd, "checkpoints-metadata"); bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage"); bool remove_all_storage = vshCommandOptBool(cmd, "remove-all-storage"); - bool delete_snapshots = vshCommandOptBool(cmd, "delete-snapshots"); + bool delete_snapshots = vshCommandOptBool(cmd, "delete-storage-volume-snapshots"); bool nvram = vshCommandOptBool(cmd, "nvram"); bool keep_nvram = vshCommandOptBool(cmd, "keep-nvram"); /* Positive if these items exist. */ @@ -3687,7 +3687,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) size_t j; virshControlPtr priv = ctl->privData; - VSH_REQUIRE_OPTION("delete-snapshots", "remove-all-storage"); + VSH_REQUIRE_OPTION("delete-storage-volume-snapshots", "remove-all-storage"); VSH_EXCLUSIVE_OPTIONS("nvram", "keep-nvram"); ignore_value(vshCommandOptStringQuiet(ctl, cmd, "storage", &vol_string));