Fabio/windows-arm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Verify PID is not empty

Browse source
This commit is contained in:
Kroese 2024-04-16 16:33:54 +02:00 committed by GitHub
parent 871b623016
commit 334d2752c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/power.sh
View file

@ -25,7 +25,7 @@ _trap() {
ready() { ready() {
[ -f "$STORAGE/windows.boot" ] && return 0 [ -f "$STORAGE/windows.boot" ] && return 0
[ ! -f "$QEMU_PTY" ] && return 1 [ ! -s "$QEMU_PTY" ] && return 1
local line="Windows Boot Manager" local line="Windows Boot Manager"
if grep -Fq "$line" "$QEMU_PTY"; then if grep -Fq "$line" "$QEMU_PTY"; then
@ -42,7 +42,7 @@ finish() {
touch "$QEMU_END" touch "$QEMU_END"
if [ -f "$QEMU_PID" ]; then if [ -s "$QEMU_PID" ]; then
pid=$(<"$QEMU_PID") pid=$(<"$QEMU_PID")
error "Forcefully terminating Windows, reason: $reason..." error "Forcefully terminating Windows, reason: $reason..."
@ -51,7 +51,7 @@ finish() {
while isAlive "$pid"; do while isAlive "$pid"; do
sleep 1 sleep 1
# Workaround for zombie pid # Workaround for zombie pid
[ ! -f "$QEMU_PID" ] && break [ ! -s "$QEMU_PID" ] && break
done done
fi fi
@ -64,7 +64,7 @@ finish() {
fi fi
pid="/var/run/tpm.pid" pid="/var/run/tpm.pid"
[ -f "$pid" ] && pKill "$(<"$pid")" [ -s "$pid" ] && pKill "$(<"$pid")"
fKill "wsdd" fKill "wsdd"
fKill "smbd" fKill "smbd"
@ -81,7 +81,7 @@ terminal() {
local dev="" local dev=""
if [ -f "$QEMU_OUT" ]; then if [ -s "$QEMU_OUT" ]; then
local msg local msg
msg=$(<"$QEMU_OUT") msg=$(<"$QEMU_OUT")
@ -129,7 +129,7 @@ _graceful_shutdown() {
touch "$QEMU_END" touch "$QEMU_END"
info "Received $1, sending ACPI shutdown signal..." info "Received $1, sending ACPI shutdown signal..."
if [ ! -f "$QEMU_PID" ]; then if [ ! -s "$QEMU_PID" ]; then
error "QEMU PID file does not exist?" error "QEMU PID file does not exist?"
finish "$code" && return "$code" finish "$code" && return "$code"
fi fi
@ -158,7 +158,7 @@ _graceful_shutdown() {
! isAlive "$pid" && break ! isAlive "$pid" && break
# Workaround for zombie pid # Workaround for zombie pid
[ ! -f "$QEMU_PID" ] && break [ ! -s "$QEMU_PID" ] && break
info "Waiting for Windows to shutdown... ($cnt/$QEMU_TIMEOUT)" info "Waiting for Windows to shutdown... ($cnt/$QEMU_TIMEOUT)"