diff options
Diffstat (limited to 'source/kde')
6 files changed, 6 insertions, 62 deletions
diff --git a/source/kde/kde/build/powerdevil b/source/kde/kde/build/powerdevil index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/powerdevil +++ b/source/kde/kde/build/powerdevil @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/doinst.sh/powerdevil b/source/kde/kde/doinst.sh/powerdevil index 8745d6291..0f783c818 100644 --- a/source/kde/kde/doinst.sh/powerdevil +++ b/source/kde/kde/doinst.sh/powerdevil @@ -12,7 +12,4 @@ 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-session-power.rules.new config etc/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new 2>/dev/null - diff --git a/source/kde/kde/post-install/powerdevil.post-install b/source/kde/kde/post-install/powerdevil.post-install index 4d6b9f836..92303702c 100644 --- a/source/kde/kde/post-install/powerdevil.post-install +++ b/source/kde/kde/post-install/powerdevil.post-install @@ -2,29 +2,9 @@ mkdir -p $PKG/etc mv $PKG/etc/kde/dbus-1 $PKG/etc/ -mkdir -p $PKG/etc/polkit-1/rules.d - -# Add upower policy allowing users in the 'power' group -# to suspend/hibernate the computer: +# Add powerdevil policy file that allows users in the 'power' group +# to check for existence of a discrete gpu: +mkdir -p $PKG/usr/share/polkit-1/rules.d 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" == "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-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 -fi + $CWD/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules \ + $PKG/usr/share/polkit-1/rules.d/10-enable-powerdevil-discrete-gpu.rules.new diff --git a/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules b/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules deleted file mode 100644 index 2a8a5a70b..000000000 --- a/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules +++ /dev/null @@ -1,12 +0,0 @@ -polkit.addRule( - function(action, subject) { - 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; - } - } -); - diff --git a/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules b/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules deleted file mode 100644 index db4992062..000000000 --- a/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules +++ /dev/null @@ -1,12 +0,0 @@ -polkit.addRule( - function(action, subject) { - if ( (action.id == "org.freedesktop.login1.reboot" || - action.id == "org.freedesktop.login1.reboot-multiple-sessions" || - action.id == "org.freedesktop.login1.power-off" || - action.id == "org.freedesktop.login1.power-off-multiple-sessions") - && subject.isInGroup("power") ) { - return polkit.Result.YES; - } - } -); - diff --git a/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules b/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules deleted file mode 100644 index 4bccfb014..000000000 --- a/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules +++ /dev/null @@ -1,9 +0,0 @@ -polkit.addRule( - function(action, subject) { - if ( (action.id == "org.freedesktop.upower.suspend" || - action.id == "org.freedesktop.upower.hibernate") - && subject.isInGroup("power") ) { - return polkit.Result.YES; - } - } -); |