Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=c483c8cd104351b4d147d050c68b418792cff48c

commit c483c8cd104351b4d147d050c68b418792cff48c
Author: James Buren <[email protected]>
Date:   Thu Aug 22 23:58:35 2013 -0500

lightdm-1.7.9-2-x86_64
* release bump
* drop /etc/sysconfig/desktop usage
* add systemd service

diff --git a/source/xfce4/lightdm/FrugalBuild b/source/xfce4/lightdm/FrugalBuild
index 84c8ddd..4edbce5 100644
--- a/source/xfce4/lightdm/FrugalBuild
+++ b/source/xfce4/lightdm/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=lightdm
pkgver=1.7.9
-pkgrel=1
+pkgrel=2
pkgdesc="A lightweight display manager."
rodepends=('lightdm-gtk-greeter')
depends=('webkit-gtk3' 'dbus-glib' 'libxklavier' 'accountsservice' 'xrdb')
@@ -26,13 +26,16 @@ source=($source \
lightdm-autologin.pam \
xsession \
lightdm.pam \
-       lightdm.tmpfiles)
+       lightdm.tmpfiles \
+       lightdm.service
+       )
sha1sums=('ec36edeeb461e239827cd8466945b4ddb3162537' \
'e1415f2eeeeea5d2d9c76d472558e5388eb0d25e' \
'8f355fc8170cdf4f3a94a699b849ea7a978a91e0' \
'7261a104c145025c63f8febfcecc189badfd3e86' \
'441fbf6d2e8c76d66d83eaf9bc5b484ed2846a30' \
-          'e10a39f505c58b2cb9b53f764e8383740f592bcb')
+          'e10a39f505c58b2cb9b53f764e8383740f592bcb' \
+          'b9e5b203e2e7fbaa98622a7407659a255722497e')
replaces=('slim')

subpkgs=("${subpkgs[@]}" "liblightdm-qt")
@@ -53,6 +56,7 @@ build() {
Fmkdir /etc/pam.d/
Finstall 644 lightdm.pam etc/pam.d/lightdm
Finstall 644 lightdm-autologin.pam etc/pam.d/lightdm-autologin
+       Ffile /lib/systemd/system/lightdm.service

# some tweaks
Frm /etc/init
diff --git a/source/xfce4/lightdm/lightdm.install 
b/source/xfce4/lightdm/lightdm.install
index cb71a53..5732db6 100644
--- a/source/xfce4/lightdm/lightdm.install
+++ b/source/xfce4/lightdm/lightdm.install
@@ -1,7 +1,8 @@
post_install()
{
-       sed 's|"/usr/bin/lightdm"$|"/usr/sbin/lightdm"|' -i 
/etc/sysconfig/desktop
-       sed 's|^#desktop="/usr/sbin/lightdm"$|desktop="/usr/sbin/lightdm"|' -i 
/etc/sysconfig/desktop
+       if [ ! -h /etc/systemd/system/display-manager.service ]; then
+               systemctl enable lightdm.service
+       fi
getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
getent passwd lightdm > /dev/null 2>&1 || useradd -c 'LightDM Display Manager' 
-u 620 -g lightdm -d /var/run/lightdm -s /sbin/nologin lightdm
passwd -l lightdm > /dev/null
@@ -11,13 +12,19 @@ post_install()
post_upgrade()
{
post_install
+       systemctl daemon-reload >/dev/null 2>&1
+}
+
+pre_remove()
+{
+       systemctl --no-reload disable lightdm.service >/dev/null 2>&1
}

post_remove()
{
-       sed -i 's|^desktop="/usr/sbin/lightdm"$|#desktop="/usr/sbin/lightdm"|' 
/etc/sysconfig/desktop
getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+       systemctl daemon-reload >/dev/null 2>&1
}

op=$1
diff --git a/source/xfce4/lightdm/lightdm.service 
b/source/xfce4/lightdm/lightdm.service
new file mode 100644
index 0000000..be7f223
--- /dev/null
+++ b/source/xfce4/lightdm/lightdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightweight Display Manager
[email protected] plymouth-quit.service
+After=systemd-user-sessions.service [email protected] plymouth-quit.service
+
+[Service]
+ExecStart=/usr/sbin/lightdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to