From e1ccb6c3285e7e78e9cc88365d9394393ed12957 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Oct 2023 20:39:38 -0500 Subject: [PATCH 1/8] Update install.yml moving --- roles/network/tasks/install.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/network/tasks/install.yml b/roles/network/tasks/install.yml index 188713b8f..df473eae1 100644 --- a/roles/network/tasks/install.yml +++ b/roles/network/tasks/install.yml @@ -31,7 +31,6 @@ - libnss-mdns # 27kB download: RasPiOS (and package avahi-daemon, above) install this regardless -- client-side library -- provides name resolution via mDNS (Multicast DNS) using Zeroconf/Bonjour e.g. Avahi - netmask # 25kB download: Handy utility -- helps determine network masks - net-tools # 248kB download: RasPiOS installs this regardless -- @jvonau suggests possibly deleting this...unless oldtimers really want these older commands in iiab-diagnostics output? - - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes - rfkill # 87kB download: RasPiOS installs this regardless -- enable & disable wireless devices - wireless-tools # 112kB download: RasPiOS installs this regardless -- manipulate Linux Wireless Extensions - wpasupplicant # 1188kB download: RasPiOS installs this regardless -- client library for connections to a WiFi AP From cf47363316f718e8b491459de0a346daf2d9116d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Oct 2023 20:46:45 -0500 Subject: [PATCH 2/8] Update sysd-netd-debian.yml rework for RasPiOS --- roles/network/tasks/sysd-netd-debian.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 391494382..32734a77b 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -1,4 +1,11 @@ # sysd-netd-debian.yml +- name: 'Install systemd-networkd, systemd-resolved, networkd-dispatcher + package: + name: + - systemd-networkd + - systemd-resolved + - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes + - name: Copy the bridge script - Creates br0 template: dest: /etc/systemd/network/IIAB-Bridge.netdev From 4c8ca30769770e04f5f3be9bc4451df93cc851af Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Oct 2023 20:57:55 -0500 Subject: [PATCH 3/8] Update sysd-netd-debian.yml --- roles/network/tasks/sysd-netd-debian.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 32734a77b..1613f9a4c 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -2,8 +2,6 @@ - name: 'Install systemd-networkd, systemd-resolved, networkd-dispatcher package: name: - - systemd-networkd - - systemd-resolved - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes - name: Copy the bridge script - Creates br0 From b81d3365de75d1dfa31c38cf457c28be15a2f239 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Oct 2023 20:58:28 -0500 Subject: [PATCH 4/8] Update sysd-netd-debian.yml --- roles/network/tasks/sysd-netd-debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 1613f9a4c..3a815008d 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -1,5 +1,5 @@ # sysd-netd-debian.yml -- name: 'Install systemd-networkd, systemd-resolved, networkd-dispatcher +- name: 'Install networkd-dispatcher package: name: - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes From 7055165f7705326b0499e97ceb199de4d2685307 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Oct 2023 21:13:07 -0500 Subject: [PATCH 5/8] Update sysd-netd-debian.yml --- roles/network/tasks/sysd-netd-debian.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 3a815008d..0a734aa44 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -4,6 +4,12 @@ name: - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes +- name: 'Install networkd-resolved + package: + name: + - networkd-resolved + when: is_raspbian and os_ver is version('raspbian-12', '>=') + - name: Copy the bridge script - Creates br0 template: dest: /etc/systemd/network/IIAB-Bridge.netdev From cdd88d20c55e5c7c9d45b5d2b045c7ff60ff09a7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Oct 2023 21:19:02 -0500 Subject: [PATCH 6/8] Update sysd-netd-debian.yml 'systemd' --- roles/network/tasks/sysd-netd-debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 0a734aa44..3fe944511 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -4,10 +4,10 @@ name: - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes -- name: 'Install networkd-resolved +- name: 'Install systemd-resolved for RasPiOS package: name: - - networkd-resolved + - systemd-resolved when: is_raspbian and os_ver is version('raspbian-12', '>=') - name: Copy the bridge script - Creates br0 From 6f397c63a9f8629a6b7952b80fca4b77a59d0fa1 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Oct 2023 15:32:50 -0400 Subject: [PATCH 7/8] sysd-netd-debian.yml: Install systemd-resolved (if available) --- roles/network/tasks/main.yml | 4 ++-- roles/network/tasks/sysd-netd-debian.yml | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 9e2954892..7a1e6d5f5 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -75,13 +75,13 @@ - name: NetworkManager in use include_tasks: NM-debian.yml when: network_manager_active - #when: is_debuntu and network_manager_active - name: systemd-networkd in use include_tasks: sysd-netd-debian.yml when: systemd_networkd_active - #when: is_debuntu and systemd_networkd_active + #when: systemd_networkd_active and not network_manager_active # 2023-10-11: NOT the right way to solve #3657 (systemd-resolved issue on RasPiOS 12+) as this would damage Ubuntu/Mint. + # 2023-10-11: Should rpi_debian.yml go away in future, now that RasPiOS Bookworm uses NetworkManager? - name: Raspbian can use dhcpcd only with no N-M or SYS-NETD active include_tasks: rpi_debian.yml when: is_raspbian and not network_manager_active diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 3fe944511..7fb0e26c9 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -1,14 +1,19 @@ # sysd-netd-debian.yml -- name: 'Install networkd-dispatcher +- name: Install networkd-dispatcher package: - name: - - networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes + name: networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes -- name: 'Install systemd-resolved for RasPiOS +# 2023-10-14 #3657, #3658, #3659: New RasPiOS 12/Bookworm issue. +# FWIW Ubuntu >= 22.10 offers 'systemd-resolved' as a distinct apt package. +# Whereas Ubuntu <= 22.04 bundled the functionality within apt package 'systemd' +# Debian 12/Bookworm (like Ubuntu >= 22.10) offers it as a distinct package: +# https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.en.html#systemd-resolved +- name: Install systemd-resolved (or intentionally show red error then continue, if apt package not available) package: - name: - - systemd-resolved - when: is_raspbian and os_ver is version('raspbian-12', '>=') + name: systemd-resolved # 278kB download: For RasPiOS 12/Bookworm + ignore_errors: yes + #shell: apt -y install systemd-resolved || true + #when: is_raspbian and os_ver is version('raspbian-12', '>=') - name: Copy the bridge script - Creates br0 template: From bbef784d8011f2c23e9097820ee012f43edd367f Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Oct 2023 15:45:51 -0400 Subject: [PATCH 8/8] sysd-netd-debian.yml: Clean comment spacing --- roles/network/tasks/sysd-netd-debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index 7fb0e26c9..9868d5b96 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -1,7 +1,7 @@ # sysd-netd-debian.yml - name: Install networkd-dispatcher package: - name: networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes + name: networkd-dispatcher # 15kB download: Dispatcher service for systemd-networkd connection status changes # 2023-10-14 #3657, #3658, #3659: New RasPiOS 12/Bookworm issue. # FWIW Ubuntu >= 22.10 offers 'systemd-resolved' as a distinct apt package. @@ -10,7 +10,7 @@ # https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.en.html#systemd-resolved - name: Install systemd-resolved (or intentionally show red error then continue, if apt package not available) package: - name: systemd-resolved # 278kB download: For RasPiOS 12/Bookworm + name: systemd-resolved # 278kB download: For RasPiOS 12/Bookworm ignore_errors: yes #shell: apt -y install systemd-resolved || true #when: is_raspbian and os_ver is version('raspbian-12', '>=')