[neon/neon/calamares-settings/Neon/release-lts] oem-prepare/calamares/oem-prepare/prepare-user: add hotfix for broken oem mode

Harald Sitter null at kde.org
Wed Mar 10 15:25:13 GMT 2021


Git commit f8e357b5066ba4e4aece9a3e53fe6bfca37c4ee7 by Harald Sitter.
Committed on 10/03/2021 at 15:25.
Pushed by sitter into branch 'Neon/release-lts'.

add hotfix for broken oem mode

with calamares now using pkexec (since we, or rather debian, dropped a
patch that forced it to use sudo) the autostart of the oem cala is
broken for unknown reasons to do with effective uid not being 0. it's
entirely unclear why that is happening though. the command simply gets
run through QProcess::startdetatch

M  +4    -0    oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2

https://invent.kde.org/neon/neon/calamares-settings/commit/f8e357b5066ba4e4aece9a3e53fe6bfca37c4ee7

diff --git a/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2 b/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
index 2ecb13c..93af733 100755
--- a/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
+++ b/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
@@ -18,6 +18,10 @@ pkexec /calamares/oem-prepare/prepare-system/calamares-oem-prepare-root
 
 mkdir -p ~/.config/autostart
 cp /usr/share/applications/calamares.desktop ~/.config/autostart
+# HACK
+# FIXME pkexec during autostart falls over because of 'pkexec must be setuid root' I don't understand why.
+# FIXME need a localauthority config instead of the sudo dance to work with pkexec
+sed -i 's/Exec=.*pkexec /Exec=sudo /g' ~/.config/autostart/calamares.desktop
 
 # Drop anything on the desktop. It'd show up in the oem-config session.
 rm -r ~/Desktop/*


More information about the Neon-commits mailing list