Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reboot handler calls #239

Merged
merged 1 commit into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/raspberrypi/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
- name: Reboot Pis
- name: Reboot Pi
ansible.builtin.reboot:
2 changes: 1 addition & 1 deletion roles/raspberrypi/tasks/prereq/Archlinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
- name: Enable cgroup via boot commandline if not already enabled for Archlinux
ansible.builtin.lineinfile:
path: /boot/boot.txt
search_string: setenv bootargs console=ttyS1,115200 console=tty0 root=PARTUUID=${uuid} rw rootwait smsc95xx.macaddr="${usbethaddr}"

Check warning on line 5 in roles/raspberrypi/tasks/prereq/Archlinux.yml

View workflow job for this annotation

GitHub Actions / Lint

yaml[line-length]

Line too long (135 > 120 characters)

Check warning on line 5 in roles/raspberrypi/tasks/prereq/Archlinux.yml

View workflow job for this annotation

GitHub Actions / Lint

5:121 [line-length] line too long (135 > 120 characters)
line: setenv bootargs console=ttyS1,115200 console=tty0 root=PARTUUID=${uuid} rw rootwait smsc95xx.macaddr="${usbethaddr}" cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory

Check warning on line 6 in roles/raspberrypi/tasks/prereq/Archlinux.yml

View workflow job for this annotation

GitHub Actions / Lint

yaml[line-length]

Line too long (184 > 120 characters)

Check warning on line 6 in roles/raspberrypi/tasks/prereq/Archlinux.yml

View workflow job for this annotation

GitHub Actions / Lint

6:121 [line-length] line too long (184 > 120 characters)
register: kernel_cmdline_cgroup

- name: Create
ansible.builtin.command: ./mkscr
args:
chdir: /boot
notify: reboot
notify: Reboot Pi
changed_when: false
when: kernel_cmdline_cgroup.changed # noqa: no-handler
2 changes: 1 addition & 1 deletion roles/raspberrypi/tasks/prereq/CentOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
backrefs: yes
regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
notify: reboot
notify: Reboot Pi
2 changes: 1 addition & 1 deletion roles/raspberrypi/tasks/prereq/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
backrefs: true
notify: reboot
notify: Reboot Pi

- name: Install iptables
ansible.builtin.apt:
Expand Down
2 changes: 1 addition & 1 deletion roles/raspberrypi/tasks/prereq/Raspbian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
backrefs: true
notify: reboot
notify: Reboot Pi

- name: Flush iptables before changing to iptables-legacy
ansible.builtin.iptables:
Expand Down
2 changes: 1 addition & 1 deletion roles/raspberrypi/tasks/prereq/Ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
backrefs: yes
regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
notify: reboot
notify: Reboot Pi
- name: Install Ubuntu Raspi Extra Packages
ansible.builtin.apt:
# Fixes issues in newer Ubuntu where VXLan isn't setup right.
Expand Down
Loading