From 2c00c64aba9ed8052a47e39a6ae2d05e65a5a357 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Thu, 18 Aug 2022 15:21:09 +0200 Subject: [PATCH] Revert "Add new regulatory-domain parameter to cloud-init files" Existing Ubuntu version does not like new regulatory-domain parameter being present. This reverts commit 31252bf1c4af5c375fc7588855f7da8ca4b6a585. --- debian/changelog | 1 - src/OptionsPopup.qml | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa2b9df..8264aa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ rpi-imager (1.7.3) unstable; urgency=medium * Fix ""Cannot send events to objects owned by a different thread" warning * Update Slovan/Korean language files * Allow selecting file names without extension - * Add new regulatory-domain parameter to cloud-init files * Add possibility to outsource handling of custom settings to script at /usr/lib/raspberrypi-sys-mods/imager_custom diff --git a/src/OptionsPopup.qml b/src/OptionsPopup.qml index 04a89e5..8fb97ab 100644 --- a/src/OptionsPopup.qml +++ b/src/OptionsPopup.qml @@ -733,7 +733,6 @@ Popup { cloudinitnetwork += "wifis:\n" cloudinitnetwork += " renderer: networkd\n" cloudinitnetwork += " wlan0:\n" - cloudinitnetwork += " regulatory-domain: \""+fieldWifiCountry.editText+"\"\n" cloudinitnetwork += " dhcp4: true\n" cloudinitnetwork += " optional: true\n" cloudinitnetwork += " access-points:\n" @@ -743,7 +742,9 @@ Popup { cloudinitnetwork += " hidden: true\n" } - /* legacy */ + /* FIXME: setting wifi country code broken on Ubuntu + For unknown reasons udev does not trigger setregdomain automatically and as a result + our setting in /etc/default/crda is being ignored by Ubuntu. */ addCloudInitRun("sed -i 's/^\s*REGDOMAIN=\S*/REGDOMAIN="+fieldWifiCountry.editText+"/' /etc/default/crda || true") } if (chkLocale.checked) {