From eb2e9eb4ae50151fed0c10a400144413100a47fe Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 19 Jul 2024 21:46:18 -0400
Subject: [PATCH] fixes

---
 bigboot_execute_resize.yml    |  5 +++++
 bigboot_rear_backup.yml       |  5 +++--
 bigboot_setup_environment.yml | 10 +++++++---
 vars/bigboot_vars.yml         |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml
index 08cf67b..4ddfca7 100644
--- a/bigboot_execute_resize.yml
+++ b/bigboot_execute_resize.yml
@@ -74,11 +74,16 @@
       when:
         - bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | bool
 
+    - name: Get the list of services on the host
+      ansible.builtin.service_facts:
+
     - name: Re-enabling Docker service
       ansible.builtin.service:
         name: docker.service
         state: started
         enabled: true
+      when:
+        - "'docker.service' in ansible_facts['services']"
 
     - name: Re-enabling services previously disabled
       ansible.builtin.service:
diff --git a/bigboot_rear_backup.yml b/bigboot_rear_backup.yml
index 7d28ea1..81cbb46 100644
--- a/bigboot_rear_backup.yml
+++ b/bigboot_rear_backup.yml
@@ -2,5 +2,6 @@
 - name: Perform a ReaR backup if any disk modifications are to be made
   ansible.builtin.import_playbook: rhc.rear.rear_backup
   when:
-    - bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | default('false') | bool
-    - not bigboot_data[inventory_hostname]['bigboot_skip_rear_backup'] | default('true') | bool
+    - (bigboot_data[inventory_hostname]['bigboot_execute_shrink_lv'] | bool
+        or bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | bool)
+    - not bigboot_skip_rear | default('true') | bool
diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml
index 3685100..f847126 100644
--- a/bigboot_setup_environment.yml
+++ b/bigboot_setup_environment.yml
@@ -12,11 +12,16 @@
     - name: Cleanup from any previous executions
       ansible.builtin.import_tasks: tasks/cleanup.yml
 
+    - name: Get the list of services on the host
+      ansible.builtin.service_facts:
+
     - name: Disable Docker service due to incompatibility
       ansible.builtin.service:
         name: docker.service
         state: stopped
         enabled: false
+      when:
+        - "'docker.service' in ansible_facts['services']"
 
     - name: Capture boot device details
       ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml
@@ -34,9 +39,8 @@
                 'bigboot_execute_shrink_lv': bigboot_execute_shrink_lv,
                 'bigboot_adjacent_lvm_device': bigboot_adjacent_lvm_device,
                 'bigboot_lv_shrink_size': bigboot_lv_shrink_size | int,
-                'bigboot_size': bigboot_size,
-                'bigboot_skip_rear_backup': bigboot_skip_rear | default('false')
+                'bigboot_size': bigboot_size
               }
-            })}}"
+            }) }}"
 
 ...
diff --git a/vars/bigboot_vars.yml b/vars/bigboot_vars.yml
index d680b89..825299f 100644
--- a/vars/bigboot_vars.yml
+++ b/vars/bigboot_vars.yml
@@ -9,7 +9,7 @@ bigboot_reboot_timeout: 1800
 bigboot_skip_rear_backup: false
 
 # Max value in minutes for the timeout threshold:
-bigboot_service_max_timeout: 2
+bigboot_service_max_timeout: 5
 
 # List of services which will be excluded from being
 # disabled during Bigboot execution: