Compare commits

...

8 Commits
v4.24 ... v4.26

Author SHA1 Message Date
Kroese
478b6af755 fix: Skip healthcheck during shutdown
fix: Skip healthcheck during shutdown
2023-11-09 16:17:30 +01:00
Kroese
fecd4052fc fix: Skip healtcheck during shutdow 2023-11-09 16:16:51 +01:00
Kroese
0b8306d827 fix: Skip healthcheck during shutdown
fix: Skip healthcheck during shutdown
2023-11-09 16:15:08 +01:00
Kroese
c9d0688424 fix: Skip healthcheck during shutdown 2023-11-09 15:55:35 +01:00
Kroese
413a089e02 build: Shellcheck
build: Shellcheck
2023-11-09 01:12:17 +01:00
Kroese
01e23f22fb build: Shellcheck 2023-11-09 01:12:01 +01:00
Kroese
308a764bb0 fix: Prepare agent for removal
fix: Prepare for removal
2023-11-09 01:09:55 +01:00
Kroese
5ad5f8a8ef fix: Prepare for removal 2023-11-09 01:08:46 +01:00
3 changed files with 7 additions and 27 deletions

View File

@@ -11,4 +11,4 @@ jobs:
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
env:
SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153
SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153 -e SC2004

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -u
VERSION="8"
VERSION="9"
HEADER="VirtualDSM Agent"
# Functions
@@ -45,8 +45,12 @@ function downloadUpdate {
[[ "$remote_size" == "" || "$remote_size" == "0" ]] && return
remote_size=$(($remote_size+0))
((remote_size<100)) && return
SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
local_size=$(stat -c%s "$SCRIPT")
local_size=$(($local_size+0))
[[ remote_size -eq local_size ]] && return
@@ -126,31 +130,6 @@ else
fi
delay=500
elapsed=$((($(date +%s%N) - ts)/1000000))
if [[ delay -gt elapsed ]]; then
difference=$((delay-elapsed))
float=$(echo | awk -v diff="${difference}" '{print diff * 0.001}')
sleep "$float"
fi
# Display message in docker log output
IP=$(ip address show dev eth0 | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
if [[ "$IP" == "20.20"* ]]; then
MSG="port 5000"
else
MSG="http://${IP}:5000"
fi
echo ""
info "--------------------------------------------------------"
info " You can now login to DSM at ${MSG}"
info "--------------------------------------------------------"
echo ""
# Wait for NMI interrupt as a shutdown signal
while true; do

View File

@@ -2,6 +2,7 @@
set -u
[ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
[ -f "/run/qemu.counter" ] && echo "QEMU is shutting down.." && exit 1
# Retrieve IP from guest VM for Docker healthcheck
RESPONSE=$(curl -s -m 16 -S http://127.0.0.1:2210/read?command=10 2>&1)