Compare commits

..

No commits in common. "f7ff982098df26599637ca53bcb04ad005e3da96" and "e7b4bb9a4b39685950fc95b554f8f1d5ecad1d4e" have entirely different histories.

2 changed files with 1 additions and 4 deletions

View File

@ -1,8 +1,6 @@
os_flavor: "freebsd" os_flavor: "freebsd"
zfs_snapshot_datasets: zfs_snapshot_datasets:
- zroot/freebsd/main/be - zroot/freebsd/main/be
- zdata/vm
- zdata/k8spersistent
sshd_enabled: true sshd_enabled: true
loader_conf: "mrmanager_loader.conf" loader_conf: "mrmanager_loader.conf"
rc_conf: "mrmanager_rc.conf" rc_conf: "mrmanager_rc.conf"

View File

@ -46,7 +46,7 @@ function cleanup {
} }
vms=() vms=()
for sig in EXIT INT QUIT HUP TERM; do for sig in EXIT INT QUIT HUP TERM; do
trap "set +e; sleep 10; cleanup" "$sig" trap "set +e; cleanup" "$sig"
done done
function die { function die {
@ -170,7 +170,6 @@ function start_vm {
set +x set +x
if [ $exit_code -eq 0 ]; then if [ $exit_code -eq 0 ]; then
echo "Rebooting." echo "Rebooting."
sleep 5
elif [ $exit_code -eq 1 ]; then elif [ $exit_code -eq 1 ]; then
echo "Powered off." echo "Powered off."
break break