[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-37-g1b843ed

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 46eef9f97e1db0fc1840ff50107d9c41d326bee3
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue Jan 26 21:19:12 2010 +0200

    suspend.sh: honour running /sbin/shutdown only if run by root
    
    Closes: #565855 -- please do not use pidof in /etc/acpi/actions/{suspend, lid,
    sleep}.sh

diff --git a/debian/changelog b/debian/changelog
index 5728288..de9f32c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ eeepc-acpi-scripts (1.1.8) UNRELEASED; urgency=low
   [ Damyan Ivanov ]
   * wireless.sh/disable: do not fail if no interface can be brought down
   * add ${misc:Depends} to dependencies
+  * suspend.sh: when checking for a running shutdown, check only for processes
+    owned by root. Closes: #565855
+    Thanks to Daniel Kahn Gillmor for reporting.
 
  -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Sat, 23 Jan 2010 03:59:24 +0000
 
diff --git a/etc/acpi/actions/suspend.sh b/etc/acpi/actions/suspend.sh
index a5c803c..77b4cc0 100755
--- a/etc/acpi/actions/suspend.sh
+++ b/etc/acpi/actions/suspend.sh
@@ -7,7 +7,7 @@ FUNC_LIB=/usr/share/eeepc-acpi-scripts/functions.sh
 . /etc/default/eeepc-acpi-scripts
 . $FUNC_LIB
 
-if (runlevel | grep -q [06]) || (pidof '/sbin/shutdown' > /dev/null); then
+if (runlevel | grep -q [06]) || (pgrep -f -z -u root '/sbin/shutdown' > /dev/null); then
     exit 0
 fi
 

-- 
Maintenance of eeepc-acpi-scripts debian package