Unverified Commit d73ad07e authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Error handling during shutdown (#1080)

parent b276cb2e

src/check.sh

+3 −3
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ set -Eeuo pipefail 


: "${NETWORK:="Y"}"



[ -f "/run/shm/qemu.end" ] && echo "QEMU is shutting down.." && exit 1

[ ! -s "/run/shm/qemu.pid" ] && echo "QEMU is not running yet.." && exit 0

[[ "$NETWORK" == [Nn]* ]] && echo "Networking is disabled.." && exit 0

[ -f "/run/shm/qemu.end" ] && echo "QEMU is shutting down..." && exit 1

[ ! -s "/run/shm/qemu.pid" ] && echo "QEMU is not running yet..." && exit 0

[[ "$NETWORK" == [Nn]* ]] && echo "Networking is disabled." && exit 0



file="/run/shm/qemu.url"

[ ! -s "$file" ] && echo "The container has not enabled networking yet..." && exit 1

src/power.sh

+1 −2
Original line number Diff line number Diff line
@@ -118,13 +118,12 @@ _graceful_shutdown() { 
    SIGQUIT) code=131 ;;

  esac



  set +e



  if [ -f "$QEMU_END" ]; then

    info "Received $1 while already shutting down..."

    return

  fi



  set +e

  touch "$QEMU_END"

  info "Received $1, sending ACPI shutdown signal..."