From fc79adbed4a89fcb20db8b9474dad65f58aef85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Mar 2024 16:00:13 +0100 Subject: [PATCH] Support different syntaxes for lxc incus snapshot create / restore --- lib/lxc.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/lxc.sh b/lib/lxc.sh index 4493f76..597fadf 100644 --- a/lib/lxc.sh +++ b/lib/lxc.sh @@ -64,7 +64,11 @@ LXC_CREATE () { sleep 3 log_info "Creating initial snapshot $LXC_NAME ..." - $lxc snapshot create $LXC_NAME snap0 + if [[ "$lxc" == "lxc" ]]; then + $lxc snapshot $LXC_NAME snap0 + else + $lxc snapshot create $LXC_NAME snap0 + fi if [[ -z "$($lxc list $LXC_NAME --format json | jq '.[].snapshots[] | select(.name=="snap0")')" ]] then @@ -99,7 +103,11 @@ CREATE_LXC_SNAPSHOT () { if ! LXC_SNAPSHOT_EXISTS "$snapname" then log_info "(Creating snapshot $snapname ...)" - $lxc snapshot create $LXC_NAME $snapname + if [[ "$lxc" == "lxc" ]]; then + $lxc snapshot $LXC_NAME $snapname + else + $lxc snapshot create $LXC_NAME $snapname + fi fi _LXC_START_AND_WAIT $LXC_NAME @@ -118,7 +126,11 @@ LOAD_LXC_SNAPSHOT () { while [[ ${retry_lxc} -lt 10 ]] do LXC_STOP $LXC_NAME || true - $lxc snapshot restore $LXC_NAME $snapname && break || retry_lxc=$(($retry_lxc+1)) + if [[ "$lxc" == "lxc" ]]; then + $lxc restore $LXC_NAME $snapname && break || retry_lxc=$(($retry_lxc+1)) + else + $lxc snapshot restore $LXC_NAME $snapname && break || retry_lxc=$(($retry_lxc+1)) + fi log_warning "Failed to restore snapshot? Retrying in 20 sec ..." if [[ ${retry_lxc} -ge 3 ]] then