diff --git a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash index 2ffbc49..5871160 100644 --- a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash +++ b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash @@ -77,7 +77,6 @@ function start_vm { -s 0,hostbridge \ -s "4,nvme,/dev/zvol/${zfs_path}/disk0" \ -s "2:0,virtio-net,netgraph,path=${bridge_name}:,peerhook=${bridge_link_name},mac=${mac_address}" \ - -s 3,ahci-cd,/vm/.iso/archlinux-2023.04.01-x86_64.iso \ -s 30,xhci,tablet \ -s 31,lpc -l com1,stdio \ -l "bootrom,/usr/local/share/uefi-firmware/BHYVE_UEFI.fd,${mount_path}/BHYVE_UEFI_VARS.fd" \ diff --git a/ansible/roles/rust/tasks/linux.yaml b/ansible/roles/rust/tasks/linux.yaml index 6298c49..3047d23 100644 --- a/ansible/roles/rust/tasks/linux.yaml +++ b/ansible/roles/rust/tasks/linux.yaml @@ -4,5 +4,4 @@ - rustup - lldb # for lldb-vscode - musl # for building static binaries - - rust-analyzer state: present diff --git a/ansible/roles/zfs/files/zfs_clone_recv.bash b/ansible/roles/zfs/files/zfs_clone_recv.bash index 6c33a8c..b94e5cf 100644 --- a/ansible/roles/zfs/files/zfs_clone_recv.bash +++ b/ansible/roles/zfs/files/zfs_clone_recv.bash @@ -7,6 +7,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # -s if the stream is interrupted, save the partial stream. The stream can then be resumed by doing a zfs send -t token where token is the receive_resume_token prop on the dataset we received into. # -u Do not mount the filesystem we are receiving. We can always mount afterwards but this avoids issues with streams with mountpoints to places like / -zfs recv -s -u +exec zfs recv -s -u "${@}" # To delete an interrupted recv, run `zfs receive -A dataset` diff --git a/ansible/roles/zfs/files/zfs_clone_send.bash b/ansible/roles/zfs/files/zfs_clone_send.bash index a2de904..b641ce2 100644 --- a/ansible/roles/zfs/files/zfs_clone_send.bash +++ b/ansible/roles/zfs/files/zfs_clone_send.bash @@ -7,7 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # TODO: Do we want --backup ? # We get --props automatically from --replicate -zfs send --compressed --replicate --large-block --embed --verbose "${@}" +exec zfs send --compressed --replicate --large-block --embed --verbose "${@}" # On zfs recv side, may want to pass `-s` to make the stream resumable.