Hello community, here is the log from the commit of package acpid for openSUSE:Factory checked in at 2013-08-18 22:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acpid (Old) and /work/SRC/openSUSE:Factory/.acpid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acpid" Changes: -------- --- /work/SRC/openSUSE:Factory/acpid/acpid.changes 2013-08-04 16:48:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.acpid.new/acpid.changes 2013-08-18 22:43:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 13 06:44:10 UTC 2013 - mch...@suse.com + +- power_button: iterate systemd-logind sessions and do nothing if a + active X session found (bnc#810125) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ power_button ++++++ --- /var/tmp/diff_new_pack.TVoiOV/_old 2013-08-18 22:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.TVoiOV/_new 2013-08-18 22:43:34.000000000 +0200 @@ -54,5 +54,28 @@ fi done < <(ck-list-sessions) +# iterate over all sessions. If a active X session is found, do nothing +# bnc#810125 - 12.3 power button always halts system instead suspend +# similar to consolekit checks, this time we check systemd-logind sessions +while read SESSION DUMMY ; do + + # check if this is a X session, if not, go on + DISP=`loginctl --property=Display show-session $SESSION` + DISP=`echo $DISP | sed -e 's/^Display=//'` + [ -n "$DISP" ] || continue + + STATE=`loginctl --property=State show-session $SESSION` + STATE=`echo $STATE | sed -e 's/^State=//'` + + if [ "$STATE" = "active" -a -n "$DISP" ]; then + # additional check, if none of these two apps are running, go on + if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" -o -n "`pidof dalston-power-applet`" -o -n "`pidof gnome-settings-daemon`" ]; then + echo doing nothing... + exit 0 + fi + fi + +done < <(loginctl list-sessions) + logger -s -t pm-profiler "Power Button pressed, executing $EXEC" $EXEC -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org