From 9a271848858ae3bb28cfeaf87742b11e88e69c12 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 10 Oct 2024 19:03:11 -0400 Subject: [PATCH] Update router vm scripts. --- router/launch_mediamtx.bash | 10 +++++----- router/launch_opnsense.bash | 2 +- router/launch_unifi.bash | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/router/launch_mediamtx.bash b/router/launch_mediamtx.bash index 262a588..4a70fe9 100644 --- a/router/launch_mediamtx.bash +++ b/router/launch_mediamtx.bash @@ -19,7 +19,7 @@ function cleanup { done } vms=() -for sig in EXIT INT QUIT HUP TERM; do +for sig in EXIT; do trap "set +e; sleep 10; cleanup" "$sig" done @@ -67,17 +67,17 @@ function start_vm { local bridge_link_name bridge_link_name=$(detect_available_link "${bridge_name}") - # additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}") - additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}" "-s" "3,ahci-cd,/home/talexander/disk.iso") + additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}") + # additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}" "-s" "3,ahci-cd,/home/talexander/disk.iso") + # -H \ vms+=("$name") while true; do set -x set +e bhyve \ -D \ - -c 1 \ + -c 2 \ -m 3G \ - -H \ -o 'rtc.use_localtime=false' \ -s 0,hostbridge \ -s "4,nvme,/dev/zvol/zroot/vm/mediamtx/disk0" \ diff --git a/router/launch_opnsense.bash b/router/launch_opnsense.bash index b0ec7f9..1318ca9 100644 --- a/router/launch_opnsense.bash +++ b/router/launch_opnsense.bash @@ -19,7 +19,7 @@ function cleanup { done } vms=() -for sig in EXIT INT QUIT HUP TERM; do +for sig in EXIT; do trap "set +e; sleep 10; cleanup" "$sig" done diff --git a/router/launch_unifi.bash b/router/launch_unifi.bash index 4910cbb..60f5e72 100644 --- a/router/launch_unifi.bash +++ b/router/launch_unifi.bash @@ -19,7 +19,7 @@ function cleanup { done } vms=() -for sig in EXIT INT QUIT HUP TERM; do +for sig in EXIT; do trap "set +e; sleep 10; cleanup" "$sig" done @@ -68,6 +68,7 @@ function start_vm { bridge_link_name=$(detect_available_link "${bridge_name}") additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}") + # additional_args+=("-s" "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}" "-s" "3,ahci-cd,/home/talexander/disk.iso") vms+=("$name") while true; do set -x