hal: Branch 'master'

[Richard Hughes]

 hald/linux2/osspec.c |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 1ea5ee02440495efd754a327b7f4aefd3078c1bf (from 013d2b5ea3e51b5f8f100656c5a4ee78e32030b0)
Author: Richard <richard at hughsie.com>
Date:   Fri Jul 28 22:37:38 2006 +0100

    Check for the new suspend2 sysfs location. Advised by Nigel Cunningham, many thanks.

diff --git a/hald/linux2/osspec.c b/hald/linux2/osspec.c
index fcc59da..395043b 100644
--- a/hald/linux2/osspec.c
+++ b/hald/linux2/osspec.c
@@ -486,6 +486,8 @@ set_suspend_hibernate_keys (HalDevice *d
 		can_hibernate = TRUE;
 	if (access ("/proc/suspend2", F_OK) == 0)
 		can_hibernate = TRUE;
+	if (access ("/sys/power/suspend2/version", F_OK) == 0)
+		can_hibernate = TRUE;
 out:
 	hal_device_property_set_bool (d, "power_management.can_suspend", can_suspend);
 	hal_device_property_set_bool (d, "power_management.can_hibernate", can_hibernate);