twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-11-10 03:53:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Local variables (#447)

Browse Source 
* fix: Local variables

* fix: Keep location
This commit is contained in:
Kroese
2023-12-10 00:26:13 +01:00
committed by GitHub
parent ba7fd2fe4a
commit 03d2665725
5 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/power.sh
View File

@@ -21,6 +21,7 @@ _trap(){
_graceful_shutdown() {
set +e
local cnt response
[ ! -f "$QEMU_PID" ] && exit 130
[ -f "$QEMU_COUNT" ] && return
@@ -32,11 +33,11 @@ _graceful_shutdown() {
# echo 'system_powerdown' | nc -q 1 -w 1 localhost "${QEMU_PORT}" > /dev/null
# Send shutdown command to guest agent via serial port
RESPONSE=$(curl -sk -m 30 -S http://127.0.0.1:2210/read?command=6 2>&1)
response=$(curl -sk -m 30 -S http://127.0.0.1:2210/read?command=6 2>&1)
if [[ ! "$RESPONSE" =~ "\"success\"" ]]; then
if [[ ! "$response" =~ "\"success\"" ]]; then
echo && error "Failed to send shutdown command ( ${RESPONSE} )."
echo && error "Failed to send shutdown command ( $response )."
kill -15 "$(cat "$QEMU_PID")"
pkill -f qemu-system-x86_64 || true
@@ -46,15 +47,15 @@ _graceful_shutdown() {
while [ "$(cat $QEMU_COUNT)" -lt "$QEMU_TIMEOUT" ]; do
# Increase the counter
echo $(($(cat $QEMU_COUNT)+1)) > $QEMU_COUNT
echo $(($(cat $QEMU_COUNT)+1)) > "$QEMU_COUNT"
# Try to connect to qemu
if echo 'info version'| nc -q 1 -w 1 localhost "$QEMU_PORT" >/dev/null 2>&1 ; then
sleep 1
CNT="$(cat $QEMU_COUNT)/$QEMU_TIMEOUT"
[[ "$DEBUG" == [Yy1]* ]] && info "Shutting down, waiting... ($CNT)"
cnt="$(cat $QEMU_COUNT)/$QEMU_TIMEOUT"
[[ "$DEBUG" == [Yy1]* ]] && info "Shutting down, waiting... ($cnt)"
fi