Skip to content

Commit acd34cb

Browse files
committed
breaking: use dnf-automatic.timer also for dnf4
prior to this change, dnf-automatic-install.timer was used, which does not fully respect the config file see #13
1 parent 6475930 commit acd34cb

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@ dnf_automatic_reboot_AccuracySec: "15s"
4949
dnf_automatic_reboot_Description: "dnf-automatic-reboot"
5050
dnf_automatic_reboot_ExecStart: "/bin/bash -c '/bin/needs-restarting -r || /sbin/reboot'"
5151

52-
# Timer time
52+
# Timer settings
53+
dnf_automatic_systemd_timer: dnf5-automatic.timer
5354
dnf_automatic_timer_OnCalendar: "6:00"

tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
- name: Set DNF4 variables
44
ansible.builtin.set_fact:
55
dnf_automatic_package_name: dnf-automatic
6-
dnf_automatic_systemd_timer: dnf-automatic-install.timer
76
when: ansible_facts["pkg_mgr"] == "dnf4" or ansible_facts["pkg_mgr"] == "dnf"
87

98
- name: Set DNF5 variables
109
ansible.builtin.set_fact:
1110
dnf_automatic_package_name: dnf5-plugin-automatic
12-
dnf_automatic_systemd_timer: dnf5-automatic.timer
1311
when: ansible_facts["pkg_mgr"] == "dnf5"
1412

1513
- name: "Install package {{ dnf_automatic_package_name }}"
@@ -68,7 +66,7 @@
6866
- name: "Check status of {{ dnf_automatic_systemd_timer }}"
6967
ansible.builtin.systemd:
7068
name: "{{ dnf_automatic_systemd_timer }}"
71-
register: dnf_automatic_install_timer
69+
register: dnf_automatic_timer_status
7270

7371
- name: Start and enable systemd timer for dnf-automatic
7472
ansible.builtin.service:
@@ -78,7 +76,7 @@
7876
# run always if not in check mode or if the timer unit exists
7977
# regardless of the check mode state
8078
when: not ansible_check_mode or
81-
dnf_automatic_install_timer.status["LoadState"] == "loaded"
79+
dnf_automatic_timer_status.status["LoadState"] == "loaded"
8280

8381
- name: Check status of dnf-automatic-reboot.timer
8482
ansible.builtin.systemd:

0 commit comments

Comments
 (0)