mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2025-11-07 02:23:42 +08:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
478b6af755 | ||
|
|
fecd4052fc | ||
|
|
0b8306d827 | ||
|
|
c9d0688424 | ||
|
|
413a089e02 | ||
|
|
01e23f22fb | ||
|
|
308a764bb0 | ||
|
|
5ad5f8a8ef |
2
.github/workflows/check.yml
vendored
2
.github/workflows/check.yml
vendored
@@ -11,4 +11,4 @@ jobs:
|
|||||||
- name: Run ShellCheck
|
- name: Run ShellCheck
|
||||||
uses: ludeeus/action-shellcheck@master
|
uses: ludeeus/action-shellcheck@master
|
||||||
env:
|
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
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
VERSION="8"
|
VERSION="9"
|
||||||
HEADER="VirtualDSM Agent"
|
HEADER="VirtualDSM Agent"
|
||||||
|
|
||||||
# Functions
|
# Functions
|
||||||
@@ -45,8 +45,12 @@ function downloadUpdate {
|
|||||||
|
|
||||||
[[ "$remote_size" == "" || "$remote_size" == "0" ]] && return
|
[[ "$remote_size" == "" || "$remote_size" == "0" ]] && return
|
||||||
|
|
||||||
|
remote_size=$(($remote_size+0))
|
||||||
|
((remote_size<100)) && return
|
||||||
|
|
||||||
SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
|
SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
|
||||||
local_size=$(stat -c%s "$SCRIPT")
|
local_size=$(stat -c%s "$SCRIPT")
|
||||||
|
local_size=$(($local_size+0))
|
||||||
|
|
||||||
[[ remote_size -eq local_size ]] && return
|
[[ remote_size -eq local_size ]] && return
|
||||||
|
|
||||||
@@ -126,31 +130,6 @@ else
|
|||||||
|
|
||||||
fi
|
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
|
# Wait for NMI interrupt as a shutdown signal
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
set -u
|
set -u
|
||||||
|
|
||||||
[ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
|
[ ! -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
|
# 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)
|
RESPONSE=$(curl -s -m 16 -S http://127.0.0.1:2210/read?command=10 2>&1)
|
||||||
|
|||||||
Reference in New Issue
Block a user