diff options
author | Eric Hameleers <alien@slackware.com> | 2020-06-16 22:54:24 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-06-16 22:54:24 +0200 |
commit | 9cf329b239d83e5ab552446e286f09563b77edc1 (patch) | |
tree | 0966a5857c6f321e7dc0917e4d9b1778eb36d34d /kde | |
parent | 807e69a3d6c0e339d2d060705f4128b6fec5dceb (diff) | |
download | ktown-9cf329b239d83e5ab552446e286f09563b77edc1.tar.gz ktown-9cf329b239d83e5ab552446e286f09563b77edc1.tar.xz |
Plasma powerdevil: fix the polkit rules and install them correctly
Thanks to LuckyCyborg.
Diffstat (limited to '')
-rw-r--r-- | kde/doinst.sh/powerdevil | 2 | ||||
-rw-r--r-- | kde/post-install/powerdevil.post-install | 16 | ||||
-rw-r--r-- | kde/post-install/powerdevil/10-enable-ck2-poweroff.rules | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/kde/doinst.sh/powerdevil b/kde/doinst.sh/powerdevil index d311aa0..8745d62 100644 --- a/kde/doinst.sh/powerdevil +++ b/kde/doinst.sh/powerdevil @@ -13,6 +13,6 @@ config() { # Move over the new policy files: config etc/polkit-1/rules.d/10-enable-upower-suspend.rules.new -config etc/polkit-1/rules.d/10-enable-elogind-poweroff.rules.new +config etc/polkit-1/rules.d/10-enable-session-power.rules.new config etc/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new 2>/dev/null diff --git a/kde/post-install/powerdevil.post-install b/kde/post-install/powerdevil.post-install index 24a9bc1..718af58 100644 --- a/kde/post-install/powerdevil.post-install +++ b/kde/post-install/powerdevil.post-install @@ -10,21 +10,21 @@ install -m 0644 -o root \ $CWD/post-install/powerdevil/10-enable-upower-suspend.rules \ $PKG/etc/polkit-1/rules.d/10-enable-upower-suspend.rules.new -if [ "SLKELOGIND" = YES ]; then +if [ "SLKELOGIND" = "no" ]; then + # Add ConsoleKit2 policy file that allows users in the 'power' group + # to shutdown/reboot the computer: + install -m 0644 -o root \ + $CWD/post-install/powerdevil/10-enable-ck2-power.rules \ + $PKG/etc/polkit-1/rules.d/10-enable-session-power.rules.new +else # Add login1 policy file that allows users in the 'power' group # to shutdown/reboot the computer: install -m 0644 -o root \ $CWD/post-install/powerdevil/10-enable-elogind-power.rules \ - $PKG/etc/polkit-1/rules.d/10-enable-session-poweroff.rules.new + $PKG/etc/polkit-1/rules.d/10-enable-session-power.rules.new # Add powerdevil policy file that allows users in the 'power' group # to check for existence of a discrete gpu: install -m 0644 -o root \ $CWD/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules \ $PKG/etc/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new -else - # Add ConsoleKit2 policy file that allows users in the 'power' group - # to shutdown/reboot the computer: - install -m 0644 -o root \ - $CWD/post-install/powerdevil/10-enable-ck2-power.rules \ - $PKG/etc/polkit-1/rules.d/10-enable-session-poweroff.rules.new fi diff --git a/kde/post-install/powerdevil/10-enable-ck2-poweroff.rules b/kde/post-install/powerdevil/10-enable-ck2-poweroff.rules index 2c68027..2a8a5a7 100644 --- a/kde/post-install/powerdevil/10-enable-ck2-poweroff.rules +++ b/kde/post-install/powerdevil/10-enable-ck2-poweroff.rules @@ -1,9 +1,9 @@ polkit.addRule( function(action, subject) { - if ( (action.id == "org.freedesktop.consolekit.reboot" || - action.id == "org.freedesktop.consolekit.reboot-multiple-sessions" || - action.id == "org.freedesktop.consolekit.power-off" || - action.id == "org.freedesktop.consolekit.power-off-multiple-sessions") + if ( (action.id == "org.freedesktop.consolekit.system.restart" || + action.id == "org.freedesktop.consolekit.system.restart-multiple-users" || + action.id == "org.freedesktop.consolekit.system.stop" || + action.id == "org.freedesktop.consolekit.system.stop-multiple-users") && subject.isInGroup("power") ) { return polkit.Result.YES; } |