[oe-commits] Otavio Salvador : xinput-calibrator: Fix service file to require display-manager.service
git at git.openembedded.org
git at git.openembedded.org
Mon Jan 7 11:03:01 UTC 2013
Module: meta-openembedded.git
Branch: danny-next
Commit: ebd90bda129afef410d8a760aa0456390d67b319
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ebd90bda129afef410d8a760aa0456390d67b319
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Tue Dec 18 21:15:57 2012 +0000
xinput-calibrator: Fix service file to require display-manager.service
The xinput-calibrator.service had a requires to xserver-nodm.service
but in fact it ought to wait by any display-manager to be initialized.
We fix it changing the require to display-manager.service.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Eric Bénard <eric at eukrea.com>
---
.../xinput-calibrator/xinput-calibrator.service | 4 ++--
.../xinput-calibrator_git.bbappend | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
index e23bfc4..2301876 100644
--- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
+++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
@@ -1,8 +1,8 @@
[Unit]
Description=Loads xinput calibration data
ConditionPathExists=/etc/pointercal.xinput
-Requires=xserver-nodm.service
-After=xserver-nodm.service
+Requires=display-manager.service
+After=display-manager.service
[Service]
ExecStart=/usr/bin/xinput_calibrator_once.sh
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
index e12abec..5bc5bc3 100644
--- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
inherit systemd
More information about the Openembedded-commits
mailing list