diff --git a/playbooks/device_roles_workstation.yml b/playbooks/device_roles_workstation.yml index 53310b4..d0f2ed2 100755 --- a/playbooks/device_roles_workstation.yml +++ b/playbooks/device_roles_workstation.yml @@ -27,11 +27,4 @@ backup_s3backup_tar_args_extra: h backup_s3backup_list_extra: - /home/salt/.backup/ - tags: [ backup ] -# - role: grub -# vars: -# grub_default: "saved" -# grub_disable_os_prober: "false" -# grub_timeout: 5 -# grub_hidden_timeout: 5 -# tags: [ desktop, grub ] + tags: [ backup ] \ No newline at end of file diff --git a/roles/grub/defaults/main.yml b/roles/grub/defaults/main.yml deleted file mode 100644 index f62b5af..0000000 --- a/roles/grub/defaults/main.yml +++ /dev/null @@ -1,14 +0,0 @@ -# vim:ft=ansible: -# Defaults are for a super-simple pared-down instant GRUB -grub_default: 0 -grub_hidden_timeout: 0 -grub_hidden_timeout_quiet: "true" -grub_timeout: 0 -grub_timeout_style: hidden -grub_recordfail_timeout: 0 -grub_distributor: "`lsb_release -i -s 2> /dev/null`" -grub_cmdline_linux_default: "quiet splash" -grub_cmdline_linux: "" - -# Workaroundies -grub_disable_os_prober: "true" diff --git a/roles/grub/handlers/main.yml b/roles/grub/handlers/main.yml deleted file mode 100644 index b426840..0000000 --- a/roles/grub/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env ansible-playbook -# vim:ft=ansible: -- name: grub mkconfig - ansible.builtin.command: "grub-mkconfig -o /boot/grub/grub.cfg" - become: yes diff --git a/roles/grub/tasks/main.yml b/roles/grub/tasks/main.yml deleted file mode 100644 index a0285bc..0000000 --- a/roles/grub/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ansible-playbook -# vim:ft=ansible: ---- -- name: configure grub - block: - - name: template out grub config - ansible.builtin.template: src=grub.conf dest=/etc/default/grub mode=0644 - notify: grub mkconfig diff --git a/roles/grub/templates/grub.conf b/roles/grub/templates/grub.conf deleted file mode 100644 index 2696124..0000000 --- a/roles/grub/templates/grub.conf +++ /dev/null @@ -1,13 +0,0 @@ -# vim:ft=bash -GRUB_DEFAULT="{{ grub_default }}" -GRUB_SAVEDEFAULT=true -GRUB_HIDDEN_TIMEOUT="{{ grub_hidden_timeout }}" -GRUB_HIDDEN_TIMEOUT_QUIET="{{ grub_hidden_timeout_quiet }}" -GRUB_TIMEOUT="{{ grub_timeout }}" -GRUB_TIMEOUT_STYLE="{{ grub_timeout_style }}" -GRUB_RECORDFAIL_TIMEOUT="{{ grub_recordfail_timeout }}" -GRUB_DISTRIBUTOR="{{ grub_distributor }}" -GRUB_CMDLINE_LINUX_DEFAULT="{{ grub_cmdline_linux_default }}" -GRUB_CMDLINE_LINUX="{{ grub_cmdline_linux }}" -# Work around probing for other OSs resetting timeout -GRUB_DISABLE_OS_PROBER="{{ grub_disable_os_prober }}"