acpid update to 2.0.31

hardware/powermanagement/acpid/files/acpid.power.sh

@@ -1,42 +1,49 @@
-#!/bin/bash
-#
-# check if a X session is running and active.
-# If not, shut down the system
-#
-# Copyright (C) 2008 Holger Macht <hmacht@suse.de>
-#
-# This file is released under the GPLv2.
-#
+#!/bin/sh
 
-EXEC="/sbin/shutdown -h now"
+PATH=/usr/sbin:/usr/bin
 
-# iterate over all sessions. If a active X session is found, do nothing
-while read A; do
-    SESSION=`echo $A | sed 's/\(Session[0-9]*\)://g'`
-    [ -z "$SESSION" ] || continue
+# $1 = session number
+function get_session_processes() {
+	local uid=$(loginctl show-session $1 | grep '^User=' | sed -r -e 's/^User=(.*)$/\1/')
+	systemd-cgls "/user.slice/user-${uid}.slice/session-${1}.scope"
+}
 
-    SESSION=`echo $A | sed 's/\(Session[0-9]*\):/\1/g'`
-    IS_X=`dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit \
-    /org/freedesktop/ConsoleKit/$SESSION \
-    org.freedesktop.ConsoleKit.Session.GetX11Display`
+# Check session status using systemd
+session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}')
+for session in ${session_ids} ; do
+	session_status=$(loginctl show-session ${session})
+	session_processes="$(get_session_processes ${session})"
+	echo "${session_status}" | grep -e 'Active=yes' &> /dev/null &&
+		echo "${session_processes}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0
+done
 
-    # check if this is a X session, if not, go on
-    DISP=`echo $IS_X | sed -e 's/^.* string "\(.*\)"/\1/'`
-    [ -n "$DISP" ] || continue
+# Get the ID of the first active X11 session: using ConsoleKit
+uid_session=$(
+ck-list-sessions 2>/dev/null | \
+awk '
+/^Session[0-9]+:$/ { uid = active = x11 = "" ; next }
+{ gsub(/'\''/, "", $3) }
+$1 == "unix-user" { uid = $3 }
+$1 == "active" { active = $3 }
+$1 == "x11-display" { x11 = $3 }
+active == "TRUE" && x11 != "" {
+	print uid
+	exit
+}')
 
-    IS_ACTIVE=`dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit \
-    /org/freedesktop/ConsoleKit/$SESSION \
-    org.freedesktop.ConsoleKit.Session.IsActive`
-    IS_ACTIVE=`echo $IS_ACTIVE | sed -e 's/^.* boolean \(.*\)$/\1/'`
+# Check that there is a power manager, otherwise shut down.
+[ "$uid_session" ] &&
+ps axo uid,cmd | \
+awk '
+    $1 == '$uid_session' &&
+        ($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]/ || $2 ~ /guidance-power-manager/ ||
+        $2 ~ /plasmashell/) \
+                { found = 1; exit }
+    END { exit !found }
+' ||
+  shutdown -h now
 
-    if [ "$IS_ACTIVE" = "true" -a -n "$DISP" ]; then
-        # additional check, if none of these two apps are running, go on
-        if [ -n "`pidof kded4`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof guidance-power-manager`" -o -n "`pidof kpowersave`" -o -n "`pidof dalston-power-applet`" ]; then
-            echo doing nothing...
-            exit 0
-        fi
-    fi
-done < <(ck-list-sessions)
-
-logger -s -t acpid "Power Button pressed, executing $EXEC"
-$EXEC