talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Add VNC support for bhyve.

Browse Source
This commit is contained in:
Tom Alexander 2023-05-30 21:18:47 -04:00
parent 11d2432478
commit e2b82d8005
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash
View File

@ -18,8 +18,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# Example usage: # Example usage:
# #
# doas bhyve_netgraph_bridge create-disk zdata/vm/poudriere /vm/poudriere 10 # 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 /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
: ${CPU_CORES:="1"} : ${CPU_CORES:="1"}
: ${MEMORY:="1G"} : ${MEMORY:="1G"}
@ -27,6 +27,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
: ${IP_RANGE:="10.215.1.1/24"} # Ignored for RAW networks : ${IP_RANGE:="10.215.1.1/24"} # Ignored for RAW networks
: ${INTERFACE_NAME:="jail_nat"} # or the external interface like lagg0 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 : ${BRIDGE_NAME:="bridge_$INTERFACE_NAME"} # or bridge_raw for RAW networks
: ${VNC_ENABLE:="NO"}
: ${VNC_LISTEN:="127.0.0.1:5900"}
function main { function main {
cmd="$1" cmd="$1"
@ -101,6 +103,9 @@ function start_vm {
if [ -n "$mount_cd" ]; then if [ -n "$mount_cd" ]; then
additional_args+=("-s" "3,ahci-cd,$mount_cd") additional_args+=("-s" "3,ahci-cd,$mount_cd")
fi fi
if [ "$VNC_ENABLE" = "YES" ]; then
additional_args+=("-s" "29,fbuf,tcp=$VNC_LISTEN,w=1920,h=1080")
fi
while true; do while true; do
set -x set -x
set +e set +e

5
ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
View File

@ -28,6 +28,11 @@
// poudriere // poudriere
"hw-address": "06:8f:24:d6:21:24", "hw-address": "06:8f:24:d6:21:24",
"ip-address": "10.215.1.203" "ip-address": "10.215.1.203"
},
{
// controller0
"hw-address": "06:7b:5f:e5:b8:21",
"ip-address": "10.215.1.204"
} }
] ]
} }

3
ansible/roles/sway/tasks/freebsd.yaml
View File

@ -6,6 +6,7 @@
- wev # For debugging input - wev # For debugging input
- wlogout # Log out prompt - wlogout # Log out prompt
- xhost # to launch gparted with root permissions - xhost # to launch gparted with root permissions
- wlvncc
state: present state: present
- name: Install service configuration - name: Install service configuration
@ -29,5 +30,3 @@
loop: loop:
- src: launch_sway_freebsd.bash - src: launch_sway_freebsd.bash
dest: /usr/local/bin/launch_sway dest: /usr/local/bin/launch_sway

3
ansible/roles/sway/tasks/linux.yaml
View File

@ -6,6 +6,7 @@
creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*" creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*"
loop: loop:
- wev - wev
- wlvncc-git
- name: Update cache - name: Update cache
when: buildaur.changed when: buildaur.changed
@ -22,6 +23,7 @@
- xorg-xeyes - xorg-xeyes
- xorg-xwayland - xorg-xwayland
- rofimoji - rofimoji
- wlvncc-git
- name: Install scripts - name: Install scripts
copy: copy:
@ -33,4 +35,3 @@
loop: loop:
- src: launch_sway_linux.bash - src: launch_sway_linux.bash
dest: /usr/local/bin/launch_sway dest: /usr/local/bin/launch_sway