From fa1ed38678a70cbe664c602a2910321db49fd057 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 14 Sep 2023 13:33:33 -0400 Subject: [PATCH] Disable systemd-udev-settle on Linux on framework laptop. --- ansible/playbook.yaml | 6 ++++ .../roles/framework_laptop/tasks/common.yaml | 15 ++++++++++ .../roles/framework_laptop/tasks/freebsd.yaml | 5 ++++ .../roles/framework_laptop/tasks/linux.yaml | 9 ++++++ .../roles/framework_laptop/tasks/main.yaml | 2 ++ .../roles/framework_laptop/tasks/peruser.yaml | 29 +++++++++++++++++++ .../tasks/peruser_freebsd.yaml | 0 .../framework_laptop/tasks/peruser_linux.yaml | 0 8 files changed, 66 insertions(+) create mode 100644 ansible/roles/framework_laptop/tasks/common.yaml create mode 100644 ansible/roles/framework_laptop/tasks/freebsd.yaml create mode 100644 ansible/roles/framework_laptop/tasks/linux.yaml create mode 100644 ansible/roles/framework_laptop/tasks/main.yaml create mode 100644 ansible/roles/framework_laptop/tasks/peruser.yaml create mode 100644 ansible/roles/framework_laptop/tasks/peruser_freebsd.yaml create mode 100644 ansible/roles/framework_laptop/tasks/peruser_linux.yaml diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml index 993d215..b826a66 100644 --- a/ansible/playbook.yaml +++ b/ansible/playbook.yaml @@ -112,3 +112,9 @@ - doas - users - public_dns + +- hosts: odolinux:odofreebsd + vars: + ansible_become: True + roles: + - framework_laptop diff --git a/ansible/roles/framework_laptop/tasks/common.yaml b/ansible/roles/framework_laptop/tasks/common.yaml new file mode 100644 index 0000000..fef1101 --- /dev/null +++ b/ansible/roles/framework_laptop/tasks/common.yaml @@ -0,0 +1,15 @@ +- import_tasks: tasks/freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/linux.yaml + when: 'os_flavor == "linux"' + +- include_tasks: + file: tasks/peruser.yaml + apply: + become: yes + become_user: "{{ initialize_user }}" + when: users is defined + loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}" + loop_control: + loop_var: initialize_user diff --git a/ansible/roles/framework_laptop/tasks/freebsd.yaml b/ansible/roles/framework_laptop/tasks/freebsd.yaml new file mode 100644 index 0000000..b417174 --- /dev/null +++ b/ansible/roles/framework_laptop/tasks/freebsd.yaml @@ -0,0 +1,5 @@ +# - name: Install packages +# package: +# name: +# - foo +# state: present diff --git a/ansible/roles/framework_laptop/tasks/linux.yaml b/ansible/roles/framework_laptop/tasks/linux.yaml new file mode 100644 index 0000000..e65ea73 --- /dev/null +++ b/ansible/roles/framework_laptop/tasks/linux.yaml @@ -0,0 +1,9 @@ +# This will prevent pools from being imported, but since my laptop has a single pool with a single disk which is mounted during boot, disabling this service saves me 10 seconds at boot. Reference: https://github.com/openzfs/zfs/issues/10891 +- name: Disable services + systemd: + enabled: no + masked: true + name: "{{ item }}" + daemon_reload: yes + loop: + - systemd-udev-settle.service diff --git a/ansible/roles/framework_laptop/tasks/main.yaml b/ansible/roles/framework_laptop/tasks/main.yaml new file mode 100644 index 0000000..6805b9d --- /dev/null +++ b/ansible/roles/framework_laptop/tasks/main.yaml @@ -0,0 +1,2 @@ +- import_tasks: tasks/common.yaml + # when: foo is defined diff --git a/ansible/roles/framework_laptop/tasks/peruser.yaml b/ansible/roles/framework_laptop/tasks/peruser.yaml new file mode 100644 index 0000000..111e886 --- /dev/null +++ b/ansible/roles/framework_laptop/tasks/peruser.yaml @@ -0,0 +1,29 @@ +- include_role: + name: per_user + +# - name: Create directories +# file: +# name: "{{ account_homedir.stdout }}/{{ item }}" +# state: directory +# mode: 0700 +# owner: "{{ account_name.stdout }}" +# group: "{{ group_name.stdout }}" +# loop: +# - ".config/foo" + +# - name: Copy files +# copy: +# src: "files/{{ item.src }}" +# dest: "{{ account_homedir.stdout }}/{{ item.dest }}" +# mode: 0600 +# owner: "{{ account_name.stdout }}" +# group: "{{ group_name.stdout }}" +# loop: +# - src: foo.conf +# dest: .config/foo/foo.conf + +- import_tasks: tasks/peruser_freebsd.yaml + when: 'os_flavor == "freebsd"' + +- import_tasks: tasks/peruser_linux.yaml + when: 'os_flavor == "linux"' diff --git a/ansible/roles/framework_laptop/tasks/peruser_freebsd.yaml b/ansible/roles/framework_laptop/tasks/peruser_freebsd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/framework_laptop/tasks/peruser_linux.yaml b/ansible/roles/framework_laptop/tasks/peruser_linux.yaml new file mode 100644 index 0000000..e69de29