From 8a50e960cc56c8b65bd0b5fadb440115b13579ba Mon Sep 17 00:00:00 2001
From: "Glenn K. Lockwood" <glennklockwood@gmail.com>
Date: Sun, 28 Oct 2018 13:49:57 -0700
Subject: [PATCH] working bootsplash and bootwait options

---
 roles/common/tasks/raspi-config.yml | 8 +++++++-
 roles/common/tasks/raspi-facts.yml  | 9 +++++++++
 roles/common/vars/main.yml          | 2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/roles/common/tasks/raspi-config.yml b/roles/common/tasks/raspi-config.yml
index f5eeb67..185d9d5 100644
--- a/roles/common/tasks/raspi-config.yml
+++ b/roles/common/tasks/raspi-config.yml
@@ -27,7 +27,13 @@
 
 - name: set bootwait option
   command: "raspi-config nonint do_boot_wait {{ 1 if not macaddrs[my_macaddr].enable_bootwait else 0 }}"
-  when: macaddrs[my_macaddr].enable_bootwait != raspi_bootwait_enabled
+  when: "'enable_bootwait' in macaddrs[my_macaddr] and macaddrs[my_macaddr].enable_bootwait != raspi_bootwait_enabled"
+  tags:
+    - raspi
+
+- name: set boot splash option
+  command: "raspi-config nonint do_boot_splash {{ 1 if not macaddrs[my_macaddr].enable_bootsplash else 0 }}"
+  when: "'enable_bootsplash' in macaddrs[my_macaddr] and macaddrs[my_macaddr].enable_bootsplash != raspi_bootsplash_enabled"
   tags:
     - raspi
 
diff --git a/roles/common/tasks/raspi-facts.yml b/roles/common/tasks/raspi-facts.yml
index 3c7d213..973b915 100644
--- a/roles/common/tasks/raspi-facts.yml
+++ b/roles/common/tasks/raspi-facts.yml
@@ -39,6 +39,14 @@
   tags:
     - raspi
 
+- name: get splash screen setting 
+  shell: "raspi-config nonint get_boot_splash" # 0 == "wait"; 1 == "don't wait"
+  register: raspi_boot_splash
+  changed_when: False
+  check_mode: no
+  tags:
+    - raspi
+
 - name: get wifi country
   shell: "raspi-config nonint get_wifi_country"
   register: raspi_wifi_country
@@ -183,6 +191,7 @@
     raspi_gui_enabled: "{{ raspi_boot_gui.stdout != '0' }}"
     raspi_autologin_enabled: "{{ raspi_noautologin.stdout == '0' }}"
     raspi_bootwait_enabled: "{{ raspi_boot_nowait.stdout == '0' }}"
+    raspi_bootsplash_enabled: "{{ raspi_boot_splash.stdout == '0' }}"
     raspi_camera_enabled: "{{ raspi_camera_disabled.stdout == '0' }}"
     raspi_ssh_enabled: "{{ raspi_ssh_disabled.stdout == '0' }}"
     raspi_vnc_enabled: "{{ raspi_vnc_disabled.stdout == '0' }}"
diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml
index 681068f..34eddfb 100644
--- a/roles/common/vars/main.yml
+++ b/roles/common/vars/main.yml
@@ -8,6 +8,7 @@ macaddrs:
         enable_gui: True
         enable_autologin: False
         enable_bootwait: False
+        enable_bootsplash: False
         enable_camera: False
         enable_vnc: False
         enable_spi: False
@@ -24,6 +25,7 @@ macaddrs:
         enable_gui: False
         enable_autologin: False
         enable_bootwait: True
+        enable_bootsplash: False
         enable_camera: False
         enable_vnc: False
         enable_spi: False