summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-12-10 18:53:17 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-12-10 18:53:17 +0000
commit0177de8cb7f7d330f499beba8804f03cccecf57d (patch)
tree056a342f8ed749e10a4a6b8bc32b14b3a54f39d0
parente66f6d3761ae1f971d80decc485748805c7d94c0 (diff)
downloaddraklive-config-0177de8cb7f7d330f499beba8804f03cccecf57d.tar
draklive-config-0177de8cb7f7d330f499beba8804f03cccecf57d.tar.gz
draklive-config-0177de8cb7f7d330f499beba8804f03cccecf57d.tar.bz2
draklive-config-0177de8cb7f7d330f499beba8804f03cccecf57d.tar.xz
draklive-config-0177de8cb7f7d330f499beba8804f03cccecf57d.zip
Allow subtasks spawned by draklive-install to access the display.
draklive-install spawns gurpmi to install the bootloader packages, which needs this extra permission in the PAM configuration. Oddly, this only seems to be necessary in GNOME, not in Plasma.
-rw-r--r--config/live.cfg3
-rwxr-xr-xfiles/WIP/draklive-install2
2 files changed, 5 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 25df37a..cc121b0 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -232,6 +232,9 @@ my $_l = {
# remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time
"rpm -e --nodeps grub2",
+ # allow draklive-install to spawn subtasks that access the display
+ "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1",
+
# set the timestamp on the font directories to be a whole second
# fc-cache looks at the nano second portion which may be non-zero
# as we are on ext4, but then it will compare against the stamps
diff --git a/files/WIP/draklive-install b/files/WIP/draklive-install
index 42ac2f1..c831c5f 100755
--- a/files/WIP/draklive-install
+++ b/files/WIP/draklive-install
@@ -343,6 +343,8 @@ sub clean_live_system_hds() {
sub finish_installation {
my ($fstab) = @_;
+ #- remove the extra permission draklive added
+ run_program::rooted($::prefix, 'sed', '-i', '/for draklive-install/d', '/etc/pam.d/polkit-1');
sync_logs();
#- cleanly umount here, it will avoid fs journals to be corrupted after a hackish reboot
umount_all($fstab);