rpms/acpid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added exception for kded5 to power.sh

Browse Source 
Resolves: rhbz#1319885
This commit is contained in:
Jaroslav Škarvada 2016-07-20 16:08:34 +02:00
parent e05633f800
commit bc5c27a9df
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acpid.power.sh
View File

@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}')
for session in ${session_ids} ; do for session in ${session_ids} ; do
session_status=$(loginctl session-status ${session}) session_status=$(loginctl session-status ${session})
echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null &&
echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded4\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0
done done
# Get the ID of the first active X11 session: using ConsoleKit # Get the ID of the first active X11 session: using ConsoleKit
@ -33,7 +33,7 @@ awk '
$2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ ||
$2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ ||
$2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ ||
$2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \
{ found = 1; exit } { found = 1; exit }
END { exit !found } END { exit !found }
' || ' ||

6
acpid.spec
View File

@ -8,7 +8,7 @@
Summary: ACPI Event Daemon Summary: ACPI Event Daemon
Name: acpid Name: acpid
Version: 2.0.27 Version: 2.0.27
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz
@ -135,6 +135,10 @@ fi
%changelog %changelog
* Wed Jul 20 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.0.27-2
- Added exception for kded5 to power.sh
Resolves: rhbz#1319885
* Wed Mar 16 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.0.27-1 * Wed Mar 16 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.0.27-1
- New version - New version
Resolves: rhbz#1299109 Resolves: rhbz#1299109