From fc3e6a8308f25c2ff7aa9f3205eda0d2976d508a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Oct 2011 05:22:40 +0200 Subject: [PATCH] lightdm: switch to systemd, drop openrc support. --- srcpkgs/lightdm/files/lightdm.rc | 23 ----------------------- srcpkgs/lightdm/files/lightdm.service | 10 ++++++++++ srcpkgs/lightdm/template | 12 +++++++----- 3 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/lightdm/files/lightdm.rc create mode 100644 srcpkgs/lightdm/files/lightdm.service diff --git a/srcpkgs/lightdm/files/lightdm.rc b/srcpkgs/lightdm/files/lightdm.rc deleted file mode 100644 index 85e9927806..0000000000 --- a/srcpkgs/lightdm/files/lightdm.rc +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript - -command=/usr/bin/lightdm -name="Light Display Manager" - -depend() -{ - need dbus localmount -} - -start() -{ - ebegin "Starting ${name}" - start-stop-daemon --start --quiet --background --exec ${command} - eend $? -} - -stop() -{ - ebegin "Stopping ${name}" - start-stop-daemon --stop --exec ${command} - eend $? -} diff --git a/srcpkgs/lightdm/files/lightdm.service b/srcpkgs/lightdm/files/lightdm.service new file mode 100644 index 0000000000..e3a59d6995 --- /dev/null +++ b/srcpkgs/lightdm/files/lightdm.service @@ -0,0 +1,10 @@ +[Unit] +Description=Light Display Manager +Requires=dev-tty7.device +After=dev-tty7.device systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/lightdm + +[Install] +WantedBy=graphical.target diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 8679dcede5..08b19e47e7 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,6 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=0.3.3 +revision=1 distfiles="http://launchpad.net/lightdm/trunk/$version/+download/lightdm-$version.tar.gz" build_style=gnu_configure configure_args="--localstatedir=/var --with-greeter-user=lightdm" @@ -15,9 +16,10 @@ long_desc=" * Fully themeable (easiest with the webkit interface) * Cross-desktop (greeters can be written in any toolkit)" +conf_files="/etc/pam.d/lightdm" system_accounts="lightdm" lightdm_homedir="/var/cache/lightdm" -openrc_services="lightdm default true" +systemd_services="lightdm.service" keep_empty_dirs=yes subpackages="liblightdm-gobject liblightdm-qt lightdm-qt" @@ -62,14 +64,14 @@ post_install() # Remove provided init file and use our own. rm -rf ${DESTDIR}/etc/init - install -D -m755 ${FILESDIR}/lightdm.rc ${DESTDIR}/etc/init.d/lightdm - install -D -m644 ${FILESDIR}/lightdm.pam ${DESTDIR}/etc/pam.d/lightdm - install -D -m755 ${FILESDIR}/Xsession ${DESTDIR}/${xs} + vinstall ${FILESDIR}/lightdm.service 644 lib/systemd/system + vinstall ${FILESDIR}/lightdm.pam 644 etc/pam.d lightdm + vinstall ${FILESDIR}/Xsession 755 usr/share/lightdm + vmkdir var/cache/lightdm # Minimum UID shall be 1000 for ordinary users. sed -i -e "s|^\#\(minimum-uid=\).*|\11000|" ${DESTDIR}/etc/lightdm.conf # Provide a working session wrapper. sed -i -e "s|^\#\(session-wrapper=\).*|\1${xs}|" \ ${DESTDIR}/etc/lightdm.conf - install -d ${DESTDIR}/var/cache/lightdm }