diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2015-11-02 18:24:40 +0100 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2015-11-02 18:24:40 +0100 |
| commit | 3b5d6dfa988c074694bfef0459992318b1e2e005 (patch) | |
| tree | 756aea80450b8dd93a10c391aeeba633245e5877 | |
| parent | 8d8396b475183d98081327ff80d45863fc643d3d (diff) | |
remove trailing spaces
| -rwxr-xr-x | kvm-wrapper.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh index f49981c..0d210e3 100755 --- a/kvm-wrapper.sh +++ b/kvm-wrapper.sh @@ -588,7 +588,7 @@ function kvm_start_vm () test_pid_from_file "$PID_FILE" && fail_exit "VM $VM_NAME seems to be running already.\nPID file $PID_FILE exists" rm -rf "$MONITOR_FILE" rm -rf "$SERIAL_FILE" - test_socket "$MONITOR_FILE" && fail_exit "Monitor socket $MONITOR_FILE already existing and couldn't be removed" + test_socket "$MONITOR_FILE" && fail_exit "Monitor socket $MONITOR_FILE already existing and couldn't be removed" test_socket "$SERIAL_FILE" && fail_exit "Serial socket $SERIAL_FILE already existing and couldn't be removed" # Fork change_perms @@ -665,7 +665,7 @@ function kvm_stop_vm () fi ! test_file "PID_FILE" && echo "VM $VM_NAME is now down." - + return 0 } @@ -776,7 +776,7 @@ function kvm_create_descriptor () #sed -i 's/#KVM_CLUSTER_NODE="`hostname -s`/KVM_CLUSTER_NODE="'`hostname -s`'/g' "$VM_DESCRIPTOR" local NODENAME=$(grep KVM_CLUSTER_NODE "$VM_DESCRIPTOR" | cut -d= -f2) sed -i 's/#KVM_CLUSTER_NODE=.*/KVM_CLUSTER_NODE="'$(eval echo "$NODENAME")'"/g' "$VM_DESCRIPTOR" - + if [[ -n "$3" ]]; then qcow_create_disk "$2" "$3" elif [[ -n "$2" ]]; then @@ -821,7 +821,7 @@ function kvm_bootstrap_vm () BOOTSTRAP_SCRIPT="$BOOTSTRAP_DIR/$BOOTSTRAP_DISTRIB/bootstrap.sh" test_file "$BOOTSTRAP_SCRIPT" || fail_exit "Couldn't read $BOOTSTRAP_SCRIPT to bootstrap $VM_NAME as $BOOTSTRAP_DISTRIB" source "$BOOTSTRAP_SCRIPT" - + prepare_disks CLEANUP+=("unprepare_disks") if ! test_blockdev "${KVM_DISK[0]}" @@ -859,7 +859,7 @@ function kvm_migrate_vm () [[ -z "`get_cluster_host $REMOTE_NODE`" ]] && fail_exit "Error: Unknown host $REMOTE_NODE!" [[ -n "${KVM_PCIASSIGN_DOMAIN[@]}" ]] && fail_exit "Cannot migrate vm with pci passthrough!" - + # Update VM configuration with new node desc_update_setting "KVM_CLUSTER_NODE" "$REMOTE_NODE" PORT=$((RANDOM%1000+4000)) @@ -987,7 +987,7 @@ function kvm_build_vm () test_file "$AUTOCONF_SCRIPT" || fail_exit "Couldn't read autoconfiguration script $AUTOCONF_SCRIPT\n" kvm_create_descriptor "$VM_NAME" - + source "$AUTOCONF_SCRIPT" if [ ${#USER_OPTIONS[*]} -gt 0 ]; then @@ -1054,7 +1054,7 @@ function kvm_remove_vm () fi fi done - + if [ ${#KVM_DISK[*]} -gt 0 ]; then echo "The VM $VM_NAME used the following disks (NOT removed by $SCRIPT_NAME):" for DRIVE in "${KVM_DISK[@]}"; do |