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

Minor cloudinit tweaks

Browse source 
- Enclose SSID within brackets, to allow SSIDs with spaces
- Call 'setupcon' to have keyboard layout change applied

Setting wifi country code on Ubuntu still broken
This commit is contained in:
Floris Bos 2021-11-19 21:45:47 +01:00
parent 8f9fbcffeb
commit 9c8f737cf6
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
OptionsPopup.qml
View file

@ -545,7 +545,7 @@ Popup {
addCloudInit("users:")
addCloudInit("- name: pi")
addCloudInit(" groups: users,adm,dialout,audio,netdev,video,plugdev,sudo")
addCloudInit(" groups: users,adm,dialout,audio,netdev,video,plugdev,cdrom,games,input,gpio,spi,i2c,render,sudo")
addCloudInit(" shell: /bin/bash")
if (radioPasswordAuthentication.checked) {
@ -600,8 +600,13 @@ Popup {
cloudinitnetwork += " dhcp4: true\n"
cloudinitnetwork += " optional: true\n"
cloudinitnetwork += " access-points:\n"
cloudinitnetwork += " "+fieldWifiSSID.text+":\n"
cloudinitnetwork += " \""+fieldWifiSSID.text+"\":\n"
cloudinitnetwork += " password: \""+cryptedPsk+"\"\n"
/* 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) {
if (chkSkipFirstUse) {
@ -625,6 +630,7 @@ Popup {
addCloudInit("timezone: "+fieldTimezone.editText)
addCloudInitWriteFile("/etc/default/keyboard", kbdconfig, '0644')
addCloudInitRun("dpkg-reconfigure -f noninteractive keyboard-configuration || true")
addCloudInitRun("setupcon -k -v --force || true")
}
if (firstrun.length) {