diff --git a/proxmox/admin_scripts/bashrc b/proxmox/admin_scripts/bashrc index 2cfde5f..22a85bb 100644 --- a/proxmox/admin_scripts/bashrc +++ b/proxmox/admin_scripts/bashrc @@ -16,7 +16,7 @@ alias rup="restic -q -r local:/root/jc/restic/"$HOSTNAME" -p /root/jc/restic/pas function waitNoRunning { echo '- - - - - - - - Waiting VMs to migrate or shutdown 200s - - - - - - - -' while true; do - if "$(basedir "$0")"/confirm_norunning.sh "$@" >/dev/null; then + if /root/admin_scripts/confirm_norunning.sh "$@" >/dev/null; then return fi @@ -27,12 +27,12 @@ done export -f waitNoRunning function upg { - if ! "$(basedir "$0")"/shutdown_nomigrates.sh; then + if ! /root/admin_scripts/shutdown_nomigrates.sh; then tgmsg 'ERROR: upg: signaling nomigrate shutdowns' return 1 fi - if ! timeout 200 bash -c waitNomigrateShutdown 0; then + if ! timeout 200 bash -c waitNoRunning 0; then tgmsg 'ERROR: upg: running VMs before upgrade' return 1 fi @@ -49,7 +49,7 @@ function upgr { upg || return $? # 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' return 1 fi @@ -89,7 +89,7 @@ function on { 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 () { watch ls -lh "/var/lib/vz/images/$1"