summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2025-12-06 22:04:35 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2025-12-06 22:04:35 +0000
commit70a598a089a7f45fc8450732ceaa2c6103c0750a (patch)
tree81cc41f41c894139f82ee0111a1518902e2106ca
parent0c9e1cb639b8e4b98f68693b42db03b17c162c39 (diff)
downloaddraklive-config-70a598a089a7f45fc8450732ceaa2c6103c0750a.tar
draklive-config-70a598a089a7f45fc8450732ceaa2c6103c0750a.tar.gz
draklive-config-70a598a089a7f45fc8450732ceaa2c6103c0750a.tar.bz2
draklive-config-70a598a089a7f45fc8450732ceaa2c6103c0750a.tar.xz
draklive-config-70a598a089a7f45fc8450732ceaa2c6103c0750a.zip
Adapt to move of /etc/pam.d/polkit-1 to /lib/pam.d
We need to add an extra line to pam.d/polkit-1 to enable draklive-install to spawn new windows. We used to do this by appending the necessary line to the existing file in /etc/pam.d. Now that file has moved, we need to drop a complete replacement into /etc/pam.d (we don't want to append to the file in /lib/pam.d as that might get replaced by a package upgrade). Note this used to be done unconditionally, but is only needed for GNOME.
-rw-r--r--config/build.cfg6
-rw-r--r--files/polkit-17
2 files changed, 10 insertions, 3 deletions
diff --git a/config/build.cfg b/config/build.cfg
index d6c8dd5..e61ee6a 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -244,6 +244,9 @@ my $config = {
# (override files are processed in alphabetical order - make sure this one comes last).
[ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ],
+ # Allow draklive-install to spawn subtasks that access the display.
+ [ 'files/polkit-1', '/etc/pam.d/polkit-1', { mode => 0644, no_install => 1 } ],
+
# Disable Wayland when we know it won't work (workaround for mga#20079).
[ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ],
),
@@ -325,9 +328,6 @@ my $config = {
"echo $default_user > /etc/draklive-install.d/user",
"sed -i s/DEFAULT_USER/$default_user/ /etc/draklive-install.d/sysconfig/finish-install",
- # Allow draklive-install to spawn subtasks that access the display.
- "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1",
-
# Disable HPLIP systray startup.
"echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop",
diff --git a/files/polkit-1 b/files/polkit-1
new file mode 100644
index 0000000..587ede0
--- /dev/null
+++ b/files/polkit-1
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_xauth.so # for draklive-install