enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

systemd: add support for hibernate and suspend.

This commit is contained in:
Cedric Bail 2013-03-30 12:08:08 +09:00
parent cd28bc8145
commit 4e35b0369e
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2013-03-28 Cedric Bail 2013-03-28 Cedric Bail
* added support for systemd user session. * added support for systemd user session.
* added support for systemd hibernate and suspend.
2013-03-11 Mike Blumenkrantz 2013-03-11 Mike Blumenkrantz

1
NEWS
View File

@ -46,6 +46,7 @@ Additions:
* added option for preventing all keyboard layout changes * added option for preventing all keyboard layout changes
* added option for remembering filemanager windows globally * added option for remembering filemanager windows globally
* Added support for systemd user session * Added support for systemd user session
* Added support for systemd hibernate and suspend
Changes: Changes:
Modules: Modules:

23
configure.ac
View File

@ -905,16 +905,21 @@ case "$host_os" in
AC_SUBST(HIBERNATE) AC_SUBST(HIBERNATE)
;; ;;
*) *)
AC_PATH_PROGS([SUSPEND], [sleep.sh pm-suspend],[/etc/acpi/sleep.sh], [/etc/acpi:/sbin:/usr/sbin:$PATH]) if test "x{have_systemd_user_session}" = "xyes"; then
if test "$SUSPEND" = "/etc/acpi/sleep.sh" ; then SUSPEND="/usr/bin/systemctl suspend"
SUSPEND="/etc/acpi/sleep.sh force" HIBERNATE="/usr/bin/systemctl hibernate"
AC_MSG_NOTICE([use suspend method: $SUSPEND]) else
fi 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]) 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 if test "$HIBERNATE" = "/etc/acpi/hibernate.sh" ; then
HIBERNATE="/etc/acpi/hibernate.sh force" HIBERNATE="/etc/acpi/hibernate.sh force"
AC_MSG_NOTICE([use hibernate method: $HIBERNATE]) AC_MSG_NOTICE([use hibernate method: $HIBERNATE])
fi
fi fi
;; ;;
esac esac

6
data/units/e18.service
View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=Enlightenment 17 service Description=Enlightenment 18 service
Before=end.target Before=end.target
After=xorg.target After=xorg.target
Requires=xorg.target Requires=xorg.target
@ -19,8 +19,8 @@ RestartSec=2
StartLimitInterval=30 StartLimitInterval=30
StartLimitBurst=7 StartLimitBurst=7
KillMode=process KillMode=process
WatchdogSec=1 WatchdogSec=10
TimeoutSec=1 TimeoutSec=5
NotifyAccess=all NotifyAccess=all
[Install] [Install]