Switch to an explicit install_graphics variable rather than using graphics_driver to control all graphics install.

This commit is contained in:
Tom Alexander 2022-11-25 15:29:29 -05:00
parent 11ef6647f1
commit 2222c9d033
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
9 changed files with 10 additions and 8 deletions

View File

@ -11,6 +11,7 @@ network_rc: "odofreebsd_network.conf"
rc_conf: "odofreebsd_rc.conf"
loader_conf: "odofreebsd_loader.conf"
netgraph_config: "setup_netgraph_odo"
install_graphics: true
graphics_driver: "intel"
cputype: "intel"
cpu_opt: tigerlake

View File

@ -18,6 +18,7 @@ users:
zfs_snapshot_datasets:
- zroot/linux/archmain/home
- zroot/linux/archmain/be
install_graphics: true
graphics_driver: "intel"
build_user:
name: talexander

View File

@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

View File

@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

View File

@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

View File

@ -9,7 +9,7 @@
state: present
- name: Install packages
when: graphics_driver is defined
when: install_graphics is defined and install_graphics
package:
name:
- pinentry-qt5

View File

@ -4,8 +4,8 @@ use-standard-socket
default-cache-ttl 600
max-cache-ttl 7200
display :0
{% if graphics_driver is defined and os_flavor == "linux" %}
{% if install_graphics is defined and install_graphics and os_flavor == "linux" %}
pinentry-program /usr/bin/pinentry-qt
{% elif graphics_driver is defined and os_flavor == "freebsd" %}
{% elif install_graphics is defined and install_graphics and os_flavor == "freebsd" %}
pinentry-program /usr/local/bin/pinentry-qt5
{% endif %}

View File

@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics

View File

@ -1,2 +1,2 @@
- import_tasks: tasks/common.yaml
when: graphics_driver is defined
when: install_graphics is defined and install_graphics