From ef2e0215e0eaa26db6f8a5c5ed5502923877e7e0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Dec 2012 21:15:57 +0000 Subject: [PATCH] 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. (From meta-openembedded rev: ade2d4d35e1efdd83bb555949bcfb8c7a1970ff0) Signed-off-by: Otavio Salvador Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../xinput-calibrator/xinput-calibrator/xinput-calibrator.service | 4 ++-- .../recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-openembedded/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-openembedded/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service index e23bfc4..2301876 100644 --- a/meta-openembedded/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service +++ b/meta-openembedded/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-openembedded/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/meta-openembedded/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend index e12abec..5bc5bc3 100644 --- a/meta-openembedded/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +++ b/meta-openembedded/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 -- 2.7.4