From bf6b434fcec48818360b9d4c055fb766a54d10e4 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Thu, 23 Feb 2017 13:15:32 +0100 Subject: [PATCH] delete old grub role --- roles/grub/defaults/main.yml | 4 ---- roles/grub/handlers/main.yml | 7 ------- roles/grub/tasks/main.yml | 15 --------------- roles/grub/templates/50_custom.j2 | 17 ----------------- 4 files changed, 43 deletions(-) delete mode 100644 roles/grub/defaults/main.yml delete mode 100644 roles/grub/handlers/main.yml delete mode 100644 roles/grub/tasks/main.yml delete mode 100644 roles/grub/templates/50_custom.j2 diff --git a/roles/grub/defaults/main.yml b/roles/grub/defaults/main.yml deleted file mode 100644 index adcb1d7..0000000 --- a/roles/grub/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -system: - shutdown: reboot - grub: - timeout: 0 diff --git a/roles/grub/handlers/main.yml b/roles/grub/handlers/main.yml deleted file mode 100644 index a7e3e2c..0000000 --- a/roles/grub/handlers/main.yml +++ /dev/null @@ -1,7 +0,0 @@ -- name: Update GRUB - command: update-grub - failed_when: ('error' in grub_register_update.stderr) - register: grub_register_update - - # TODO: Do we need to use grub-set-default? - # https://github.com/yavdr/yavdr-utils/blob/master/events/actions/update-grub diff --git a/roles/grub/tasks/main.yml b/roles/grub/tasks/main.yml deleted file mode 100644 index 5277c73..0000000 --- a/roles/grub/tasks/main.yml +++ /dev/null @@ -1,15 +0,0 @@ -- name: custom grub configuration for timeout and reboot halt - template: - src: templates/50_custom.j2 - dest: /etc/grub.d/50_custom - mode: '0775' - notify: [ 'Update GRUB' ] - -- name: let the system boot quietly - lineinfile: - dest: /etc/default/grub - state: present - regexp: '^(GRUB_CMDLINE_LINUX_DEFAULT=")' - line: '\1quiet nosplash"' - backrefs: yes - notify: [ 'Update GRUB' ] diff --git a/roles/grub/templates/50_custom.j2 b/roles/grub/templates/50_custom.j2 deleted file mode 100644 index a7e5be3..0000000 --- a/roles/grub/templates/50_custom.j2 +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -exec tail -n +3 $0 - -# This file is configured by the ansible configuration for yaVDR - -{% if system.shutdown is defined and system.shutdown == 'reboot' %} -menuentry "PowerOff" { - halt -} -{% endif %} - -if [ "${recordfail}" = 1 ]; then - set timeout={{ 3 if system.grub.timeout < 3 else system.grub.timeout }} -else - set timeout={{ system.grub.timeout if system.grub.timeout is defined else 0 }} -fi -