braintypo fixes
interesting, it was tested before, maybe was out of sync with ansible?
This commit is contained in:
@@ -16,7 +16,7 @@ alias rup="restic -q -r local:/root/jc/restic/"$HOSTNAME" -p /root/jc/restic/pas
|
|||||||
function waitNoRunning {
|
function waitNoRunning {
|
||||||
echo '- - - - - - - - Waiting VMs to migrate or shutdown 200s - - - - - - - -'
|
echo '- - - - - - - - Waiting VMs to migrate or shutdown 200s - - - - - - - -'
|
||||||
while true; do
|
while true; do
|
||||||
if "$(basedir "$0")"/confirm_norunning.sh "$@" >/dev/null; then
|
if /root/admin_scripts/confirm_norunning.sh "$@" >/dev/null; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -27,12 +27,12 @@ done
|
|||||||
export -f waitNoRunning
|
export -f waitNoRunning
|
||||||
|
|
||||||
function upg {
|
function upg {
|
||||||
if ! "$(basedir "$0")"/shutdown_nomigrates.sh; then
|
if ! /root/admin_scripts/shutdown_nomigrates.sh; then
|
||||||
tgmsg 'ERROR: upg: signaling nomigrate shutdowns'
|
tgmsg 'ERROR: upg: signaling nomigrate shutdowns'
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! timeout 200 bash -c waitNomigrateShutdown 0; then
|
if ! timeout 200 bash -c waitNoRunning 0; then
|
||||||
tgmsg 'ERROR: upg: running VMs before upgrade'
|
tgmsg 'ERROR: upg: running VMs before upgrade'
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@@ -49,7 +49,7 @@ function upgr {
|
|||||||
upg || return $?
|
upg || return $?
|
||||||
|
|
||||||
# double confirmation
|
# double confirmation
|
||||||
if ! timeout 200 bash -c waitNomigrateShutdown 1; then
|
if ! timeout 200 bash -c waitNoRunning 1; then
|
||||||
tgmsg 'ERROR: upgr: running VMs before reboot'
|
tgmsg 'ERROR: upgr: running VMs before reboot'
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@@ -89,7 +89,7 @@ function on {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
alias h="echo 'avail cmds: off on | updl upg upgr | localprogress'"
|
alias h="echo 'avail cmds: off on | upg upgr | updl localprogress'"
|
||||||
|
|
||||||
function localprogress () {
|
function localprogress () {
|
||||||
watch ls -lh "/var/lib/vz/images/$1"
|
watch ls -lh "/var/lib/vz/images/$1"
|
||||||
|
|||||||
Reference in New Issue
Block a user