Merge pull request #788 from konstruktoid/reboot

ensure rebooting works after masking ctrl-alt-del

Author: konstruktoid

molecule/default/verify.yml

@@ -194,18 +194,22 @@
         - DefaultLimitNOFILE={{ limit_nofile_hard }}
         - DefaultLimitNPROC={{ limit_nproc_hard }}
 
-    - name: Verify masked Ctrl-Alt-Del
-      become: true
-      ansible.builtin.systemd:
-        name: ctrl-alt-del.target
-        masked: true
-        enabled: false
-        state: stopped
-      check_mode: true
-      register: ctrl_alt_del_target
-      failed_when: ctrl_alt_del_target is changed
+    - name: Verify Ctrl-Alt-Del
       when:
         - ansible_virtualization_type not in ["container", "docker", "podman"]
+      block:
+        - name: Get Ctrl-Alt-Del target status
+          ansible.builtin.systemd:
+            name: ctrl-alt-del.target
+          register: ctrl_alt_del_target
+
+        - name: Verify Ctrl-Alt-Del target LoadState
+          ansible.builtin.systemd:
+            name: ctrl-alt-del.target
+          register: ctrl_alt_del_target
+          failed_when:
+            - ctrl_alt_del_target.status.LoadState != "masked"
+            - not "reboot.target" in ctrl_alt_del_target.status.FragmentPath
 
     - name: Verify systemd user.conf
       become: true

tasks/ctrlaltdel.yml

@@ -1,15 +1,33 @@
 ---
-- name: Get ctrl-alt-del systemd information
+- name: Get ctrl-alt-del.target information
   ansible.builtin.systemd:
     name: ctrl-alt-del.target
   register: ctrl_alt_del_target
 
+- name: Comment out ctrl-alt-del alias
+  become: true
+  ansible.builtin.lineinfile:
+    regexp: ^Alias=ctrl-alt-del.target
+    line: "# Alias=ctrl-alt-del.target"
+    dest: "{{ ctrl_alt_del_target.status.FragmentPath }}"
+    mode: "0644"
+    state: present
+    create: false
+    backrefs: true
+
+- name: Reload systemd
+  become: true
+  ansible.builtin.systemd:
+    daemon_reload: true
+
 - name: Disable systemd ctrl-alt-del
   become: true
-  ansible.builtin.file:
-    src: /dev/null
-    path: "{{ ctrl_alt_del_target.status.FragmentPath }}"
-    state: link
-    owner: root
-    group: root
-    force: true
+  ansible.builtin.systemd:
+    name: ctrl-alt-del.target
+    masked: true
+    enabled: false
+    state: stopped
+  register: ctrl_alt_del_target_state
+  failed_when:
+    - ctrl_alt_del_target_state.failed
+    - not "already exists and is a symlink" in ctrl_alt_del_target_state.msg