diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-12 17:27:25 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-12 17:27:25 +0200 |
| commit | e6a52ebf66f2b60ad1afb478bfe358514043b676 (patch) | |
| tree | 7b7bd6feb01ddf1f0340523bd02903b57b76885e /extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | |
| parent | 678a7a4fb762d6669c9c2105b78d107aeebe163e (diff) | |
| parent | 21c375ba65c4730e25cd0b135aff7811bf28c77a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/haskell-html/PKGBUILD
community-staging/haskell-regex-base/PKGBUILD
community-staging/haskell-stm/PKGBUILD
community-staging/haskell-terminfo/PKGBUILD
extra/avahi/PKGBUILD
extra/elfutils/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch')
| -rw-r--r-- | extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch new file mode 100644 index 000000000..2694334c8 --- /dev/null +++ b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch @@ -0,0 +1,35 @@ +From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sun, 2 Sep 2012 04:36:13 +0200 +Subject: [PATCH] Send resume signal when built with systemd and using + pm-utils suspend + +This case was apparently overlooked when adding systemd support. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/linux/up-backend.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index ddd4472..52b430e 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -603,10 +603,11 @@ gboolean + up_backend_emits_resuming (UpBackend *backend) + { + #ifdef HAVE_SYSTEMD +- return TRUE; +-#else +- return FALSE; ++ if (sd_booted ()) ++ return TRUE; ++ else + #endif ++ return FALSE; + } + + /** +-- +1.7.12 + |