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

Allow outsourcing custom settings to script

Browse source
This commit is contained in:
Floris Bos 2022-07-31 16:02:10 +02:00
parent 31252bf1c4
commit 4961990ce0
2 changed files with 49 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -8,6 +8,8 @@ rpi-imager (1.7.3) unstable; urgency=medium
* 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 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
-- Floris Bos <bos@je-eigen-domein.nl> Sun, 31 Jul 2022 12:15:17 +0200 -- Floris Bos <bos@je-eigen-domein.nl> Sun, 31 Jul 2022 12:15:17 +0200

65
src/OptionsPopup.qml
View file

@ -595,8 +595,12 @@ Popup {
if (chkHostname.checked && fieldHostname.length) { if (chkHostname.checked && fieldHostname.length) {
addFirstRun("CURRENT_HOSTNAME=`cat /etc/hostname | tr -d \" \\t\\n\\r\"`") addFirstRun("CURRENT_HOSTNAME=`cat /etc/hostname | tr -d \" \\t\\n\\r\"`")
addFirstRun("echo "+fieldHostname.text+" >/etc/hostname") addFirstRun("if [ -f /usr/lib/raspberrypi-sys-mods/imager_custom ]; then")
addFirstRun("sed -i \"s/127.0.1.1.*$CURRENT_HOSTNAME/127.0.1.1\\t"+fieldHostname.text+"/g\" /etc/hosts") addFirstRun(" /usr/lib/raspberrypi-sys-mods/imager_custom set_hostname "+fieldHostname.text)
addFirstRun("else")
addFirstRun(" echo "+fieldHostname.text+" >/etc/hostname")
addFirstRun(" sed -i \"s/127.0.1.1.*$CURRENT_HOSTNAME/127.0.1.1\\t"+fieldHostname.text+"/g\" /etc/hosts")
addFirstRun("fi")
addCloudInit("hostname: "+fieldHostname.text) addCloudInit("hostname: "+fieldHostname.text)
addCloudInit("manage_etc_hosts: true") addCloudInit("manage_etc_hosts: true")
@ -631,12 +635,22 @@ Popup {
if (chkSSH.checked && radioPubKeyAuthentication.checked) { if (chkSSH.checked && radioPubKeyAuthentication.checked) {
var pubkey = fieldPublicKey.text var pubkey = fieldPublicKey.text
var pubkeyArr = pubkey.split("\n") var pubkeyArr = pubkey.split("\n")
var pubkeySpaceSep = ''
if (pubkey.length) { for (var j=0; j<pubkeyArr.length; j++) {
addFirstRun("install -o \"$FIRSTUSER\" -m 700 -d \"$FIRSTUSERHOME/.ssh\"") var pkitem = pubkeyArr[j].trim();
addFirstRun("install -o \"$FIRSTUSER\" -m 600 <(printf \""+pubkey.replace(/\n/g, "\\n")+"\") \"$FIRSTUSERHOME/.ssh/authorized_keys\"") if (pkitem) {
pubkeySpaceSep += ' '+escapeshellarg(pkitem)
} }
addFirstRun("echo 'PasswordAuthentication no' >>/etc/ssh/sshd_config") }
addFirstRun("if [ -f /usr/lib/raspberrypi-sys-mods/imager_custom ]; then")
addFirstRun(" /usr/lib/raspberrypi-sys-mods/imager_custom enable_ssh -k"+pubkeySpaceSep)
addFirstRun("else")
addFirstRun(" install -o \"$FIRSTUSER\" -m 700 -d \"$FIRSTUSERHOME/.ssh\"")
addFirstRun(" install -o \"$FIRSTUSER\" -m 600 <(printf \""+pubkey.replace(/\n/g, "\\n")+"\") \"$FIRSTUSERHOME/.ssh/authorized_keys\"")
addFirstRun(" echo 'PasswordAuthentication no' >>/etc/ssh/sshd_config")
addFirstRun(" systemctl enable ssh")
addFirstRun("fi")
if (!chkSetUser.checked) { if (!chkSetUser.checked) {
addCloudInit(" lock_passwd: true") addCloudInit(" lock_passwd: true")
@ -654,6 +668,11 @@ Popup {
if (chkSSH.checked && radioPasswordAuthentication.checked) { if (chkSSH.checked && radioPasswordAuthentication.checked) {
addCloudInit("ssh_pwauth: true") addCloudInit("ssh_pwauth: true")
addFirstRun("if [ -f /usr/lib/raspberrypi-sys-mods/imager_custom ]; then")
addFirstRun(" /usr/lib/raspberrypi-sys-mods/imager_custom enable_ssh")
addFirstRun("else")
addFirstRun(" systemctl enable ssh")
addFirstRun("fi")
} }
if (chkSetUser.checked) { if (chkSetUser.checked) {
@ -678,10 +697,6 @@ Popup {
addFirstRun(" fi") addFirstRun(" fi")
addFirstRun("fi") addFirstRun("fi")
} }
if (chkSSH.checked) {
addFirstRun("systemctl enable ssh")
}
addCloudInit("") addCloudInit("")
} }
if (chkWifi.checked) { if (chkWifi.checked) {
@ -698,14 +713,21 @@ Popup {
wpaconfig += "\tpsk="+cryptedPsk+"\n" wpaconfig += "\tpsk="+cryptedPsk+"\n"
wpaconfig += "}\n" wpaconfig += "}\n"
addFirstRun("if [ -f /usr/lib/raspberrypi-sys-mods/imager_custom ]; then")
addFirstRun(" /usr/lib/raspberrypi-sys-mods/imager_custom set_wlan "
+(chkWifiSSIDHidden.checked ? " -h " : "")
+escapeshellarg(fieldWifiSSID.text)+" "+escapeshellarg(cryptedPsk)+" "+escapeshellarg(fieldWifiCountry.editText))
addFirstRun("else")
addFirstRun("cat >/etc/wpa_supplicant/wpa_supplicant.conf <<'WPAEOF'") addFirstRun("cat >/etc/wpa_supplicant/wpa_supplicant.conf <<'WPAEOF'")
addFirstRun(wpaconfig) addFirstRun(wpaconfig)
addFirstRun("WPAEOF") addFirstRun("WPAEOF")
addFirstRun("chmod 600 /etc/wpa_supplicant/wpa_supplicant.conf") addFirstRun(" chmod 600 /etc/wpa_supplicant/wpa_supplicant.conf")
addFirstRun("rfkill unblock wifi") addFirstRun(" rfkill unblock wifi")
addFirstRun("for filename in /var/lib/systemd/rfkill/*:wlan ; do") addFirstRun(" for filename in /var/lib/systemd/rfkill/*:wlan ; do")
addFirstRun(" echo 0 > $filename") addFirstRun(" echo 0 > $filename")
addFirstRun("done") addFirstRun(" done")
addFirstRun("fi")
cloudinitnetwork = "version: 2\n" cloudinitnetwork = "version: 2\n"
cloudinitnetwork += "wifis:\n" cloudinitnetwork += "wifis:\n"
@ -730,13 +752,18 @@ Popup {
kbdconfig += "XKBVARIANT=\"\"\n" kbdconfig += "XKBVARIANT=\"\"\n"
kbdconfig += "XKBOPTIONS=\"\"\n" kbdconfig += "XKBOPTIONS=\"\"\n"
addFirstRun("rm -f /etc/localtime") addFirstRun("if [ -f /usr/lib/raspberrypi-sys-mods/imager_custom ]; then")
addFirstRun("echo \""+fieldTimezone.editText+"\" >/etc/timezone") addFirstRun(" /usr/lib/raspberrypi-sys-mods/imager_custom set_keymap "+escapeshellarg(fieldKeyboardLayout.editText))
addFirstRun("dpkg-reconfigure -f noninteractive tzdata") addFirstRun(" /usr/lib/raspberrypi-sys-mods/imager_custom set_timezone "+escapeshellarg(fieldTimezone.editText))
addFirstRun("else")
addFirstRun(" rm -f /etc/localtime")
addFirstRun(" echo \""+fieldTimezone.editText+"\" >/etc/timezone")
addFirstRun(" dpkg-reconfigure -f noninteractive tzdata")
addFirstRun("cat >/etc/default/keyboard <<'KBEOF'") addFirstRun("cat >/etc/default/keyboard <<'KBEOF'")
addFirstRun(kbdconfig) addFirstRun(kbdconfig)
addFirstRun("KBEOF") addFirstRun("KBEOF")
addFirstRun("dpkg-reconfigure -f noninteractive keyboard-configuration") addFirstRun(" dpkg-reconfigure -f noninteractive keyboard-configuration")
addFirstRun("fi")
addCloudInit("timezone: "+fieldTimezone.editText) addCloudInit("timezone: "+fieldTimezone.editText)
addCloudInitRun("localectl set-x11-keymap \""+fieldKeyboardLayout.editText+"\" pc105") addCloudInitRun("localectl set-x11-keymap \""+fieldKeyboardLayout.editText+"\" pc105")