diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index 1202fe3..115c389 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -14,9 +14,9 @@ loader_conf: "odofreebsd_loader.conf" install_graphics: true graphics_driver: "intel" cputype: "intel" -cpu_opt: tigerlake +cpu_opt: skylake hwpstate: true -cores: 8 +cores: 4 build_user: name: talexander group: talexander diff --git a/ansible/environments/laptop/host_vars/odolinux b/ansible/environments/laptop/host_vars/odolinux index 5b0b087..30e0d7b 100644 --- a/ansible/environments/laptop/host_vars/odolinux +++ b/ansible/environments/laptop/host_vars/odolinux @@ -32,7 +32,7 @@ enabled_wireguard: - colo cputype: "intel" hwpstate: true -cores: 8 +cores: 4 sway_conf_files: - rofimoji docker_storage_driver: overlay2 # alternatively zfs diff --git a/ansible/environments/vm/host_vars/freebsdupdatemrmanager b/ansible/environments/vm/host_vars/freebsdupdatemrmanager index f68e738..3ace4ee 100644 --- a/ansible/environments/vm/host_vars/freebsdupdatemrmanager +++ b/ansible/environments/vm/host_vars/freebsdupdatemrmanager @@ -1,5 +1,5 @@ os_flavor: "freebsd" -cpu_opt: tigerlake +cpu_opt: skylake build_user: name: root group: wheel diff --git a/ansible/roles/network/files/odofreebsd_network.conf b/ansible/roles/network/files/odofreebsd_network.conf index bc9cca2..a6617c9 100644 --- a/ansible/roles/network/files/odofreebsd_network.conf +++ b/ansible/roles/network/files/odofreebsd_network.conf @@ -1,3 +1,4 @@ -wlans_ath0="wlan0" +#wlans_ath0="wlan0" +wlans_iwm0="wlan0" ifconfig_wlan0="WPA DHCP" ifconfig_wlan0_ipv6="inet6 accept_rtadv" diff --git a/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf b/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf index ccea36a..3489489 100644 --- a/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf +++ b/ansible/roles/poudriere/files/poudriere.d/13amd64-default-framework-make.conf @@ -4,7 +4,7 @@ # # Example from bottom of /usr/share/examples/etc/make.conf .if ${.CURDIR:N*/lang/gcc48*} && ${.CURDIR:N*/lang/gcc10*} && ${.CURDIR:N*/devel/qt6-base*} -CPUTYPE?=tigerlake +CPUTYPE?=skylake # CPUTYPE?=x86-64-v4 .endif