random-mirrors/dockur-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2026-07-07 05:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Improve shutdown logic (#1817)

Browse Source
This commit is contained in:
Kroese
2026-07-07 03:02:36 +02:00
committed by GitHub
parent 068b3cb966
commit 1e12c90226
1 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/power.sh
+20 -28
View File
@@ -22,10 +22,6 @@ _trap() {
return 0 return 0
} }
app() {
echo "$APP" && return 0
}
signalCode() { signalCode() {
local sig="$1" local sig="$1"
@@ -138,13 +134,12 @@ forceKillQemu() {
local pid="" local pid=""
local display local display
if readQemuPid "$QEMU_PID" pid; then ! readQemuPid "$QEMU_PID" pid && return 0
if isAlive "$pid"; then ! isAlive "$pid" && return 0
display=$(displayReason "$reason")
error "Forcefully terminating $(app), reason: $display..." display=$(displayReason "$reason")
{ disown "$pid" || :; kill -9 -- "$pid" || :; } 2>/dev/null error "Forcefully terminating $(app), reason: $display..."
fi { disown "$pid" || :; kill -9 -- "$pid" || :; } 2>/dev/null
fi
return 0 return 0
} }
@@ -158,12 +153,13 @@ markWindowsBooted() {
fi fi
# Remove CD-ROM ISO after install # Remove CD-ROM ISO after install
if ready; then ! ready && return 0
touch "$file"
! setOwner "$file" && error "Failed to set the owner for \"$file\" !" touch "$file"
if ! disabled "$REMOVE"; then ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"
rm -f "$BOOT" 2>/dev/null || true
fi if ! disabled "$REMOVE"; then
rm -f "$BOOT" 2>/dev/null || true
fi fi
return 0 return 0
@@ -203,7 +199,6 @@ finish() {
} }
normalizeTimeout() { normalizeTimeout() {
local min
term_grace=3 # seconds before loop ends to send SIGTERM term_grace=3 # seconds before loop ends to send SIGTERM
cleanup_grace=3 # seconds reserved after the loop for cleanup cleanup_grace=3 # seconds reserved after the loop for cleanup
@@ -221,6 +216,7 @@ normalizeTimeout() {
cleanup_grace=4 cleanup_grace=4
fi fi
local min
min=$((term_grace + cleanup_grace + 1)) min=$((term_grace + cleanup_grace + 1))
(( TIMEOUT < min )) && (( TIMEOUT = min )) (( TIMEOUT < min )) && (( TIMEOUT = min ))
@@ -232,10 +228,10 @@ normalizeTimeout() {
sendAcpiShutdown() { sendAcpiShutdown() {
[ ! -S "$QEMU_DIR/monitor.sock" ] && return 0
# Send ACPI shutdown signal # Send ACPI shutdown signal
if [ -S "$QEMU_DIR/monitor.sock" ]; then nc -q 1 -w 1 -U "$QEMU_DIR/monitor.sock" &> /dev/null <<<'system_powerdown' || :
nc -q 1 -w 1 -U "$QEMU_DIR/monitor.sock" &> /dev/null <<<'system_powerdown' || :
fi
return 0 return 0
} }
@@ -257,8 +253,8 @@ abortDuringSetup() {
waitForShutdown() { waitForShutdown() {
local cnt=0 local cnt=0
local name="$1" local pid="$1"
local pid="$2" local name="$APP"
local slp local slp
while (( cnt <= wait_until )); do while (( cnt <= wait_until )); do
@@ -294,9 +290,6 @@ graceful_shutdown() {
local sig="$1" local sig="$1"
local pid="" local pid=""
local code=0 local code=0
local name
local term_grace cleanup_grace
local sigterm_at=0 wait_until=0
[[ $BASHPID != "$TRAP_PID" ]] && return [[ $BASHPID != "$TRAP_PID" ]] && return
@@ -325,9 +318,8 @@ graceful_shutdown() {
abortDuringSetup "$code" abortDuringSetup "$code"
fi fi
name="$(app)"
normalizeTimeout normalizeTimeout
waitForShutdown "$name" "$pid" waitForShutdown "$pid"
finish "$code" finish "$code"
} }