diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-12-18 21:15:57 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-19 17:48:12 +0100 |
commit | ade2d4d35e1efdd83bb555949bcfb8c7a1970ff0 (patch) | |
tree | 8d055cd8ad513f120f4a8489f79619feae8743bb /meta-systemd | |
parent | 2ac0acc2753f9853928a081cbc80c3daacbe7e08 (diff) | |
download | meta-openembedded-ade2d4d35e1efdd83bb555949bcfb8c7a1970ff0.tar.gz |
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@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd')
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 e23bfc4f1..23018768d 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 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=Loads xinput calibration data | 2 | Description=Loads xinput calibration data |
3 | ConditionPathExists=/etc/pointercal.xinput | 3 | ConditionPathExists=/etc/pointercal.xinput |
4 | Requires=xserver-nodm.service | 4 | Requires=display-manager.service |
5 | After=xserver-nodm.service | 5 | After=display-manager.service |
6 | 6 | ||
7 | [Service] | 7 | [Service] |
8 | ExecStart=/usr/bin/xinput_calibrator_once.sh | 8 | 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 e12abec4c..5bc5bc384 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
4 | 4 | ||
5 | inherit systemd | 5 | inherit systemd |
6 | 6 | ||