From 4e1e546e4d4bb9d32d82e82236bd932ea6f88648 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Jul 20 2016 14:58:29 +0000 Subject: Added exception for plasmashell to power.sh Related: rhbz#1319885 --- diff --git a/acpid.power.sh b/acpid.power.sh index d6b4c75..db59f90 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do session_status=$(loginctl session-status ${session}) echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -29,12 +29,13 @@ active == "TRUE" && x11 != "" { ps axo uid,cmd | \ awk ' $1 == '$uid_session' && - ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || + ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || - $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || - $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \ - { found = 1; exit } + $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || + $2 ~ /kded[4-5]/ || $2 ~ /guidance-power-manager/ || + $2 ~ /plasmashell/) \ + { found = 1; exit } END { exit !found } ' || shutdown -h now diff --git a/acpid.spec b/acpid.spec index bae67f5..639490d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-3 +- Added exception for plasmashell to power.sh + Related: rhbz#1319885 + * Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-2 - Added exception for kded5 to power.sh Resolves: rhbz#1319885