lxc-delete: also delete VMs, not just containers

One checklist now lists containers and VMs side by side, each tagged with its
type, with separate ALL CT / ALL VM entries. VMs stop via qm stop and are
removed with qm destroy --purge --destroy-unreferenced-disks.

Two fixes fall out of the rework: the destroy exit status is read from the
background job rather than from the spinner, so failures actually surface, and
a guest is only stopped once its deletion is confirmed.
This commit is contained in:
MickLesk
2026-09-10 10:38:39 +02:00
parent cb1090623d
commit cca5e8320a

View File

@@ -7,11 +7,11 @@
function header_info {
clear
cat <<"EOF"
____ __ _ ________ ____ __ __
/ __ \_________ _ ______ ___ ____ _ __ / / | |/ / ____/ / __ \___ / /__ / /____
/ /_/ / ___/ __ \| |/_/ __ `__ \/ __ \| |/_/ / / | / / / / / / _ \/ / _ \/ __/ _ \
/ ____/ / / /_/ /> </ / / / / / /_/ /> < / /___/ / /___ / /_/ / __/ / __/ /_/ __/
/_/ /_/ \____/_/|_/_/ /_/ /_/\____/_/|_| /_____/_/|_\____/ /_____/\___/_/\___/\__/\___/
____ ______ __ ____ __ __
/ __ \_________ _ ______ ___ ____ _ __ / ____/_ _____ _____/ /_ / __ \___ / /__ / /____
/ /_/ / ___/ __ \| |/_/ __ `__ \/ __ \| |/_/ / / __/ / / / _ \/ ___/ __/ / / / / _ \/ / _ \/ __/ _ \
/ ____/ / / /_/ /> </ / / / / / /_/ /> < / /_/ / /_/ / __(__ ) /_ / /_/ / __/ / __/ /_/ __/
/_/ /_/ \____/_/|_/_/ /_/ /_/\____/_/|_| \____/\__,_/\___/____/\__/ /_____/\___/_/\___/\__/\___/
EOF
}
@@ -42,76 +42,146 @@ CM="${TAB}✔️${TAB}${CL}"
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "lxc-delete" "pve"
GUEST_LOG=$(mktemp)
trap 'rm -f "$GUEST_LOG"' EXIT
# pct and qm differ in both their subcommands and their list layout, so every
# guest carries its type from the menu through to the destroy call.
stop_guest() {
local type=$1 id=$2 pid
if [ "$type" == "ct" ]; then
pct stop "$id" >"$GUEST_LOG" 2>&1 &
else
qm stop "$id" >"$GUEST_LOG" 2>&1 &
fi
pid=$!
spinner "$pid"
wait "$pid" || true
}
destroy_guest() {
local type=$1 id=$2 pid
if [ "$type" == "ct" ]; then
pct destroy "$id" -f >"$GUEST_LOG" 2>&1 &
else
qm destroy "$id" --purge --destroy-unreferenced-disks >"$GUEST_LOG" 2>&1 &
fi
pid=$!
spinner "$pid"
wait "$pid"
}
header_info
echo "Loading..."
whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE LXC Deletion" --yesno "This will delete LXC containers. Proceed?" 10 58
whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE Guest Deletion" --yesno "This will delete LXC containers and/or VMs. Proceed?" 10 58
NODE=$(hostname)
containers=$(pct list | tail -n +2 | awk '{print $0 " " $4}')
containers=$(pct list 2>/dev/null | tail -n +2 || true)
vms=$(qm list 2>/dev/null | tail -n +2 || true)
if [ -z "$containers" ]; then
whiptail --title "LXC Container Delete" --msgbox "No LXC containers available!" 10 60
if [ -z "$containers" ] && [ -z "$vms" ]; then
whiptail --title "Guest Delete" --msgbox "No LXC containers or VMs available!" 10 60
exit 234
fi
menu_items=("ALL" "Delete ALL containers" "OFF") # Add as first option
FORMAT="%-10s %-15s %-10s"
declare -A GUEST_TYPE=()
menu_items=()
FORMAT="%-4s %-20s %-10s"
while read -r container; do
container_id=$(echo $container | awk '{print $1}')
container_name=$(echo $container | awk '{print $2}')
container_status=$(echo $container | awk '{print $3}')
formatted_line=$(printf "$FORMAT" "$container_name" "$container_status")
menu_items+=("$container_id" "$formatted_line" "OFF")
done <<<"$containers"
if [ -n "$containers" ]; then
menu_items+=("ALL-CT" "$(printf "$FORMAT" "CT" "Delete ALL containers" "")" "OFF")
while read -r line; do
[ -z "$line" ] && continue
# pct list: VMID Status [Lock] Name -- Lock is usually blank, so take the
# name from the end of the row rather than a fixed column.
container_id=$(awk '{print $1}' <<<"$line")
container_status=$(awk '{print $2}' <<<"$line")
container_name=$(awk '{print $NF}' <<<"$line")
GUEST_TYPE[$container_id]="ct"
menu_items+=("$container_id" "$(printf "$FORMAT" "CT" "$container_name" "$container_status")" "OFF")
done <<<"$containers"
fi
CHOICES=$(whiptail --title "LXC Container Delete" \
--checklist "Select LXC containers to delete:" 25 60 13 \
"${menu_items[@]}" 3>&2 2>&1 1>&3)
if [ -n "$vms" ]; then
menu_items+=("ALL-VM" "$(printf "$FORMAT" "VM" "Delete ALL VMs" "")" "OFF")
while read -r line; do
[ -z "$line" ] && continue
# qm list: VMID NAME STATUS MEM(MB) BOOTDISK(GB) PID
vm_id=$(awk '{print $1}' <<<"$line")
vm_name=$(awk '{print $2}' <<<"$line")
vm_status=$(awk '{print $3}' <<<"$line")
GUEST_TYPE[$vm_id]="vm"
menu_items+=("$vm_id" "$(printf "$FORMAT" "VM" "$vm_name" "$vm_status")" "OFF")
done <<<"$vms"
fi
CHOICES=$(whiptail --title "Guest Delete" \
--checklist "Select LXC containers and VMs to delete:" 25 70 13 \
"${menu_items[@]}" 3>&2 2>&1 1>&3 || true)
if [ -z "$CHOICES" ]; then
whiptail --title "LXC Container Delete" \
--msgbox "No containers selected!" 10 60
whiptail --title "Guest Delete" \
--msgbox "No guests selected!" 10 60
exit 0
fi
read -p "Delete containers manually or automatically? (Default: manual) m/a: " DELETE_MODE
read -p "Delete guests manually or automatically? (Default: manual) m/a: " DELETE_MODE
DELETE_MODE=${DELETE_MODE:-m}
selected_ids=$(echo "$CHOICES" | tr -d '"' | tr -s ' ' '\n')
# Expand the ALL entries, keeping each ID once so selecting ALL alongside a
# single guest does not try to destroy that guest twice.
expanded_ids=""
for choice in $(echo "$CHOICES" | tr -d '"' | tr -s ' ' '\n'); do
case "$choice" in
ALL-CT) expanded_ids+=$'\n'$(awk '{print $1}' <<<"$containers") ;;
ALL-VM) expanded_ids+=$'\n'$(awk '{print $1}' <<<"$vms") ;;
*) expanded_ids+=$'\n'"$choice" ;;
esac
done
selected_ids=$(echo "$expanded_ids" | sed '/^$/d' | awk '!seen[$0]++')
# If "ALL" is selected, override with all container IDs
if echo "$selected_ids" | grep -q "^ALL$"; then
selected_ids=$(echo "$containers" | awk '{print $1}')
fi
for guest_id in $selected_ids; do
guest_type="${GUEST_TYPE[$guest_id]:-}"
if [ -z "$guest_type" ]; then
echo -e "${BL}[Info]${RD} Skipping unknown guest $guest_id...${CL}"
continue
fi
for container_id in $selected_ids; do
status=$(pct status $container_id)
if [ "$status" == "status: running" ]; then
echo -e "${BL}[Info]${GN} Stopping container $container_id...${CL}"
pct stop $container_id &
sleep 5
echo -e "${BL}[Info]${GN} Container $container_id stopped.${CL}"
if [ "$guest_type" == "ct" ]; then
label="container $guest_id"
else
label="VM $guest_id"
fi
if [[ "$DELETE_MODE" == "a" ]]; then
echo -e "${BL}[Info]${GN} Automatically deleting container $container_id...${CL}"
pct destroy "$container_id" -f &
pid=$!
spinner $pid
[ $? -eq 0 ] && echo "Container $container_id deleted." || whiptail --title "Error" --msgbox "Failed to delete container $container_id." 10 60
echo -e "${BL}[Info]${GN} Automatically deleting $label...${CL}"
else
read -p "Delete container $container_id? (y/N): " CONFIRM
if [[ "$CONFIRM" =~ ^[Yy]$ ]]; then
echo -e "${BL}[Info]${GN} Deleting container $container_id...${CL}"
pct destroy "$container_id" -f &
pid=$!
spinner $pid
[ $? -eq 0 ] && echo "Container $container_id deleted." || whiptail --title "Error" --msgbox "Failed to delete container $container_id." 10 60
else
echo -e "${BL}[Info]${RD} Skipping container $container_id...${CL}"
read -p "Delete $label? (y/N): " CONFIRM
if [[ ! "$CONFIRM" =~ ^[Yy]$ ]]; then
echo -e "${BL}[Info]${RD} Skipping $label...${CL}"
continue
fi
echo -e "${BL}[Info]${GN} Deleting $label...${CL}"
fi
# Stop only once the deletion is confirmed, so declining leaves a running
# guest running instead of powering it off on the way out.
if [ "$guest_type" == "ct" ]; then
status=$(pct status "$guest_id" 2>/dev/null || echo "unknown")
else
status=$(qm status "$guest_id" 2>/dev/null || echo "unknown")
fi
if [ "$status" == "status: running" ]; then
echo -e "${BL}[Info]${GN} Stopping $label...${CL}"
stop_guest "$guest_type" "$guest_id"
echo -e "${BL}[Info]${GN} ${label^} stopped.${CL}"
fi
if destroy_guest "$guest_type" "$guest_id"; then
echo -e "${CM}${GN}${label^} deleted.${CL}"
else
whiptail --title "Error" --msgbox "Failed to delete ${label}.\n\n$(tail -n 5 "$GUEST_LOG")" 15 70
fi
done