From 9af01097c29b70e248a619b751bf3b23cb0ee840 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 10 Aug 2012 12:14:18 +0200 Subject: meta-systemd: elsa: rename to entrance * elsa was killed in r75060 and reintroduced in r75061 with old name - entrance * also use Alias=display-manager.service like gdm does now Signed-off-by: Martin Jansa --- .../meta-efl/recipes-efl/efl/elsa/xserver-nodm.service | 8 -------- meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend | 13 ------------- .../meta-efl/recipes-efl/efl/entrance/xserver-nodm.service | 8 ++++++++ meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend | 13 +++++++++++++ 4 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service delete mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend (limited to 'meta-systemd') diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service deleted file mode 100644 index 0b9c0f559b..0000000000 --- a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Login manager for Enlightenment - -[Service] -ExecStart=/usr/sbin/elsa - -[Install] -WantedBy=multi-user.target diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend deleted file mode 100644 index ac0d2bc03e..0000000000 --- a/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 1}" - -inherit systemd - -SRC_URI += "file://xserver-nodm.service" - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "xserver-nodm.service" - -RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" -RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service new file mode 100644 index 0000000000..4828686952 --- /dev/null +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service @@ -0,0 +1,8 @@ +[Unit] +Description=Login manager for Enlightenment + +[Service] +ExecStart=/usr/sbin/entrance + +[Install] +Alias=display-manager.service diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend new file mode 100644 index 0000000000..ac0d2bc03e --- /dev/null +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend @@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +SRC_URI += "file://xserver-nodm.service" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "xserver-nodm.service" + +RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" +RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" -- cgit v1.2.3-54-g00ecf