From 4be645b4f5ada8c6fb43085bf59fc8fa6d63d34d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 2 Dec 2012 15:37:40 +0100 Subject: entrance: rename xserver-nodm.service to entrance.service so it does not conflict with xserver-nodm-init in sysroot Signed-off-by: Martin Jansa --- meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service | 8 ++++++++ .../meta-efl/recipes-efl/efl/entrance/xserver-nodm.service | 8 -------- meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service delete mode 100644 meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service (limited to 'meta-systemd') diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service new file mode 100644 index 0000000000..4828686952 --- /dev/null +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.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/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service deleted file mode 100644 index 4828686952..0000000000 --- a/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service +++ /dev/null @@ -1,8 +0,0 @@ -[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 index ac0d2bc03e..df96e3495d 100644 --- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend @@ -4,10 +4,10 @@ PRINC := "${@int(PRINC) + 1}" inherit systemd -SRC_URI += "file://xserver-nodm.service" +SRC_URI += "file://entrance.service" SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "xserver-nodm.service" +SYSTEMD_SERVICE = "entrance.service" RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" -- cgit v1.2.3-54-g00ecf