cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 16:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Add new regulatory-domain parameter to cloud-init files"

Browse source 
Existing Ubuntu version does not like new regulatory-domain
parameter being present.
This reverts commit 31252bf1c4.
This commit is contained in:
Floris Bos 2022-08-18 15:21:09 +02:00
parent 4961990ce0
commit 2c00c64aba
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -7,7 +7,6 @@ rpi-imager (1.7.3) unstable; urgency=medium
* Fix ""Cannot send events to objects owned by a different thread" warning * Fix ""Cannot send events to objects owned by a different thread" warning
* Update Slovan/Korean language files * Update Slovan/Korean language files
* Allow selecting file names without extension * 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 * Add possibility to outsource handling of custom settings to script at
/usr/lib/raspberrypi-sys-mods/imager_custom /usr/lib/raspberrypi-sys-mods/imager_custom

5
src/OptionsPopup.qml
View file

@ -733,7 +733,6 @@ Popup {
cloudinitnetwork += "wifis:\n" cloudinitnetwork += "wifis:\n"
cloudinitnetwork += " renderer: networkd\n" cloudinitnetwork += " renderer: networkd\n"
cloudinitnetwork += " wlan0:\n" cloudinitnetwork += " wlan0:\n"
cloudinitnetwork += " regulatory-domain: \""+fieldWifiCountry.editText+"\"\n"
cloudinitnetwork += " dhcp4: true\n" cloudinitnetwork += " dhcp4: true\n"
cloudinitnetwork += " optional: true\n" cloudinitnetwork += " optional: true\n"
cloudinitnetwork += " access-points:\n" cloudinitnetwork += " access-points:\n"
@ -743,7 +742,9 @@ Popup {
cloudinitnetwork += " hidden: true\n" 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") addCloudInitRun("sed -i 's/^\s*REGDOMAIN=\S*/REGDOMAIN="+fieldWifiCountry.editText+"/' /etc/default/crda || true")
} }
if (chkLocale.checked) { if (chkLocale.checked) {