diff --git a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash index c009737..6928836 100644 --- a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash +++ b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash @@ -18,8 +18,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Example usage: # # doas bhyve_netgraph_bridge create-disk zdata/vm/poudriere /vm/poudriere 10 -# doas bhyve_netgraph_bridge start poudriere zdata/vm/poudriere /vm/poudriere jail_nat 10.215.1.1/24 /vm/iso/FreeBSD-13.2-RELEASE-amd64-bootonly.iso -# doas bhyve_netgraph_bridge start poudriere zdata/vm/poudriere /vm/poudriere jail_nat 10.215.1.1/24 +# doas bhyve_netgraph_bridge start poudriere zdata/vm/poudriere /vm/poudriere /vm/iso/FreeBSD-13.2-RELEASE-amd64-bootonly.iso +# doas bhyve_netgraph_bridge start poudriere zdata/vm/poudriere /vm/poudriere : ${CPU_CORES:="1"} : ${MEMORY:="1G"} @@ -27,6 +27,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" : ${IP_RANGE:="10.215.1.1/24"} # Ignored for RAW networks : ${INTERFACE_NAME:="jail_nat"} # or the external interface like lagg0 for RAW networks : ${BRIDGE_NAME:="bridge_$INTERFACE_NAME"} # or bridge_raw for RAW networks +: ${VNC_ENABLE:="NO"} +: ${VNC_LISTEN:="127.0.0.1:5900"} function main { cmd="$1" @@ -101,6 +103,9 @@ function start_vm { if [ -n "$mount_cd" ]; then additional_args+=("-s" "3,ahci-cd,$mount_cd") fi + if [ "$VNC_ENABLE" = "YES" ]; then + additional_args+=("-s" "29,fbuf,tcp=$VNC_LISTEN,w=1920,h=1080") + fi while true; do set -x set +e diff --git a/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf b/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf index 5706e53..c86dacf 100644 --- a/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf +++ b/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf @@ -28,6 +28,11 @@ // poudriere "hw-address": "06:8f:24:d6:21:24", "ip-address": "10.215.1.203" + }, + { + // controller0 + "hw-address": "06:7b:5f:e5:b8:21", + "ip-address": "10.215.1.204" } ] } diff --git a/ansible/roles/sway/tasks/freebsd.yaml b/ansible/roles/sway/tasks/freebsd.yaml index f006e35..3d46de4 100644 --- a/ansible/roles/sway/tasks/freebsd.yaml +++ b/ansible/roles/sway/tasks/freebsd.yaml @@ -6,6 +6,7 @@ - wev # For debugging input - wlogout # Log out prompt - xhost # to launch gparted with root permissions + - wlvncc state: present - name: Install service configuration @@ -29,5 +30,3 @@ loop: - src: launch_sway_freebsd.bash dest: /usr/local/bin/launch_sway - - diff --git a/ansible/roles/sway/tasks/linux.yaml b/ansible/roles/sway/tasks/linux.yaml index 12271fa..997bfae 100644 --- a/ansible/roles/sway/tasks/linux.yaml +++ b/ansible/roles/sway/tasks/linux.yaml @@ -6,6 +6,7 @@ creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*" loop: - wev + - wlvncc-git - name: Update cache when: buildaur.changed @@ -22,6 +23,7 @@ - xorg-xeyes - xorg-xwayland - rofimoji + - wlvncc-git - name: Install scripts copy: @@ -33,4 +35,3 @@ loop: - src: launch_sway_linux.bash dest: /usr/local/bin/launch_sway -