From bda3bf488143b912170005509176624bab0a8ad9 Mon Sep 17 00:00:00 2001 From: Georgi Aleksandrov Date: Tue, 19 Jul 2016 17:38:56 +0200 Subject: [PATCH] bug #4602: check before changing context cdrom --- src/vmm_mad/remotes/kvm/prereconfigure | 8 ++++++-- src/vmm_mad/remotes/kvm/reconfigure | 9 ++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/prereconfigure b/src/vmm_mad/remotes/kvm/prereconfigure index 2212013477..3276251d48 100755 --- a/src/vmm_mad/remotes/kvm/prereconfigure +++ b/src/vmm_mad/remotes/kvm/prereconfigure @@ -22,7 +22,11 @@ source $(dirname $0)/../../scripts_common.sh DOMAIN=$1 TARGET_DEVICE=$2 -CMD="virsh --connect $LIBVIRT_URI change-media $DOMAIN $TARGET_DEVICE --eject --force" +if [[ ! -z "$DOMAIN" ]] && [[ ! -z "$TARGET_DEVICE" ]] +then + CMD="virsh --connect $LIBVIRT_URI change-media $DOMAIN $TARGET_DEVICE \ + --eject --force" -exec_and_log "$CMD" "Could not eject CDROM $TARGET_DEVICE" + exec_and_log "$CMD" "Could not eject CDROM $TARGET_DEVICE" +fi diff --git a/src/vmm_mad/remotes/kvm/reconfigure b/src/vmm_mad/remotes/kvm/reconfigure index 7a22b42b7b..aaeab05a09 100755 --- a/src/vmm_mad/remotes/kvm/reconfigure +++ b/src/vmm_mad/remotes/kvm/reconfigure @@ -23,8 +23,11 @@ DOMAIN=$1 TARGET_DEVICE=$2 ISO_PATH=$3 -CMD="virsh --connect $LIBVIRT_URI \ - change-media $DOMAIN $TARGET_DEVICE $ISO_PATH --insert" +if [[ ! -z "$DOMAIN" ]] && [[ ! -z "$TARGET_DEVICE" ]] && [[ ! -z "$ISO_PATH" ]] +then + CMD="virsh --connect $LIBVIRT_URI \ + change-media $DOMAIN $TARGET_DEVICE $ISO_PATH --insert" -exec_and_log "$CMD" "Could not insert CDROM $ISO_PATH to $TARGET_DEVICE" + exec_and_log "$CMD" "Could not insert CDROM $ISO_PATH to $TARGET_DEVICE" +fi