Refactor: Move OS-specific roles under common `roles/`

[ansible.git] / playbooks / roles / debian / remove-systemd / tasks / main.yml

diff --git a/playbooks/roles/debian/remove-systemd/tasks/main.yml b/playbooks/roles/debian/remove-systemd/tasks/main.yml
index f0dd1d631cb2b8ed9cbeff5ff08e8d8d6d649401..d8df2590ad76b81f5aa7e748e7597d94f9f716ad 100644 (file)
--- a/playbooks/roles/debian/remove-systemd/tasks/main.yml
+++ b/playbooks/roles/debian/remove-systemd/tasks/main.yml
@@ -5,16 +5,18 @@
     dest: /
     owner: root
     group: root
-    mode: '0640'
+    directory_mode: '0755'
+    mode: '0644'
+    force: no
 
 - name: Install SysV init
   become: true
   apt:
     autoclean: yes
     autoremove: yes
+    cache_valid_time: 3600
     install_recommends: no
     name: ['sysvinit-core', 'sysvinit-utils']
-    purge: yes
     state: latest
     update_cache: yes
 
@@ -27,17 +29,15 @@
     owner: root
     group: root
     mode: '0644'
+    force: no
 
 - name: Purge SystemD
-  become: true
   import_tasks: remove-systemd.yml
-  ignore_errors: true
 
-- name: Reboot if SystemD is still active
-  become: true
-  reboot:
-  when: purged.rc != 0
-
-- name: Purge SystemD after reboot
-  import_tasks: remove-systemd.yml
-  when: purged.rc != 0
+- block:
+    - name: Reboot if SystemD is still active
+      become: true
+      reboot:
+    - name: Purge SystemD after reboot
+      import_tasks: remove-systemd.yml
+  when: "'rc' in purged and purged.rc != 0"