From 2f9fc0b01b8f4f5a97ec28548dda81203cfba3a2 Mon Sep 17 00:00:00 2001 From: Anton Todorov Date: Tue, 10 Dec 2019 13:46:18 +0200 Subject: [PATCH] F #4026: do not fail when CDROM already ejected (#4028) Signed-off-by: Anton Todorov (cherry picked from commit 647dcc507f60018824c16fc87c1cf4256f273a2e) --- src/vmm_mad/remotes/kvm/prereconfigure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vmm_mad/remotes/kvm/prereconfigure b/src/vmm_mad/remotes/kvm/prereconfigure index 1c82fc5165..afbf2e620a 100755 --- a/src/vmm_mad/remotes/kvm/prereconfigure +++ b/src/vmm_mad/remotes/kvm/prereconfigure @@ -24,6 +24,12 @@ TARGET_DEVICE=$2 if [[ -n "$DOMAIN" ]] && [[ -n "$TARGET_DEVICE" ]] then + disk="$(virsh --connect $LIBVIRT_URI domblklist $DOMAIN | awk "/^$TARGET_DEVICE/ {print \$2; exit}")" + if [[ "$disk" = "-" ]]; then + log_debug "CDROM already ejected" + exit 0 + fi + CMD="virsh --connect $LIBVIRT_URI change-media $DOMAIN $TARGET_DEVICE \ --eject --force"