cedric pushed a commit to branch master.
commit 4e35b0369e7ce3cf1bb49f60a838be75d7c2678e
Author: Cedric Bail <[email protected]>
Date: Sat Mar 30 12:08:08 2013 +0900
systemd: add support for hibernate and suspend.
---
ChangeLog | 1 +
NEWS | 1 +
configure.ac | 25 +++++++++++++++----------
data/units/e18.service | 6 +++---
4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2b19cb2..581fc38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2013-03-28 Cedric Bail
* added support for systemd user session.
+ * added support for systemd hibernate and suspend.
2013-03-11 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index c5d08c7..0814c9d 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,7 @@ Additions:
* added option for preventing all keyboard layout changes
* added option for remembering filemanager windows globally
* Added support for systemd user session
+ * Added support for systemd hibernate and suspend
Changes:
Modules:
diff --git a/configure.ac b/configure.ac
index 34e68dd..1c17959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -905,16 +905,21 @@ case "$host_os" in
AC_SUBST(HIBERNATE)
;;
*)
- AC_PATH_PROGS([SUSPEND], [sleep.sh pm-suspend],[/etc/acpi/sleep.sh],
[/etc/acpi:/sbin:/usr/sbin:$PATH])
- if test "$SUSPEND" = "/etc/acpi/sleep.sh" ; then
- SUSPEND="/etc/acpi/sleep.sh force"
- AC_MSG_NOTICE([use suspend method: $SUSPEND])
- fi
-
- AC_PATH_PROGS([HIBERNATE], [hibernate.sh
pm-hibernate],[/etc/acpi/hibernate.sh], [/etc/acpi:/sbin:/usr/sbin:$PATH])
- if test "$HIBERNATE" = "/etc/acpi/hibernate.sh" ; then
- HIBERNATE="/etc/acpi/hibernate.sh force"
- AC_MSG_NOTICE([use hibernate method: $HIBERNATE])
+ if test "x{have_systemd_user_session}" = "xyes"; then
+ SUSPEND="/usr/bin/systemctl suspend"
+ HIBERNATE="/usr/bin/systemctl hibernate"
+ else
+ AC_PATH_PROGS([SUSPEND], [sleep.sh pm-suspend],[/etc/acpi/sleep.sh],
[/etc/acpi:/sbin:/usr/sbin:$PATH])
+ if test "$SUSPEND" = "/etc/acpi/sleep.sh" ; then
+ SUSPEND="/etc/acpi/sleep.sh force"
+ AC_MSG_NOTICE([use suspend method: $SUSPEND])
+ fi
+
+ AC_PATH_PROGS([HIBERNATE], [hibernate.sh
pm-hibernate],[/etc/acpi/hibernate.sh], [/etc/acpi:/sbin:/usr/sbin:$PATH])
+ if test "$HIBERNATE" = "/etc/acpi/hibernate.sh" ; then
+ HIBERNATE="/etc/acpi/hibernate.sh force"
+ AC_MSG_NOTICE([use hibernate method: $HIBERNATE])
+ fi
fi
;;
esac
diff --git a/data/units/e18.service b/data/units/e18.service
index 79feb40..6e651fc 100644
--- a/data/units/e18.service
+++ b/data/units/e18.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Enlightenment 17 service
+Description=Enlightenment 18 service
Before=end.target
After=xorg.target
Requires=xorg.target
@@ -19,8 +19,8 @@ RestartSec=2
StartLimitInterval=30
StartLimitBurst=7
KillMode=process
-WatchdogSec=1
-TimeoutSec=1
+WatchdogSec=10
+TimeoutSec=5
NotifyAccess=all
[Install]
--
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
