Attachment 602727 Details for Bug 846147 – proposed patch

[patch] proposed patch

0001-display-manager-rework.patch (text/plain), 2.87 KB, created by Lennart Poettering on 2012-08-07 11:59:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lennart Poettering

Created: 2012-08-07 11:59:51 UTC

Size: 2.87 KB

patch

obsolete

>From 4e193af5b2b2669342aef76c0d4ffead76867db8 Mon Sep 17 00:00:00 2001
>From: Lennart Poettering <lennart@poettering.net>
>Date: Tue, 7 Aug 2012 13:58:14 +0200
>Subject: [PATCH] display manager rework
>
>---
> ldm.service | 13 +++++++++++++
> ldm.spec    | 26 +++++++++++++++++++++++++-
> 2 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 ldm.service
>
>diff --git a/ldm.service b/ldm.service
>new file mode 100644
>index 0000000..a94815d
>--- /dev/null
>+++ b/ldm.service
>@@ -0,0 +1,13 @@
>+[Unit]
>+Description=LTSP Display Manager
>+Documentation=man:ldm(1)
>+Conflicts=getty@tty1.service
>+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
>+
>+[Service]
>+ExecStart=/usr/sbin/ldm vt1
>+Restart=always
>+IgnoreSIGPIPE=no
>+
>+[Install]
>+Alias=display-manager.service
>diff --git a/ldm.spec b/ldm.spec
>index 93ec701..354061d 100644
>--- a/ldm.spec
>+++ b/ldm.spec
>@@ -2,7 +2,7 @@ Name:           ldm
> Version:        2.0.46
> %define _datestamp .20090917.15
> #Release:        0%{_datestamp}%{?dist}
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        LTSP Display Manager
> 
> Group:          User Interface/X
>@@ -12,6 +12,7 @@ Source0:        ldm-%{version}.tar.bz2
> # Artwork by Maureen Duffy <duffy@redhat.com>
> %define theme_version 1.0.2
> Source1:        k12linux-theme-%{theme_version}.tar.bz2
>+Source2:        ldm.service
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  gtk2-devel
>@@ -23,6 +24,11 @@ BuildRequires:  python
> Requires:       nc
> Requires:       openssh-clients
> 
>+BuildRequires:    systemd
>+Requires(post):   systemd
>+Requires(preun):  systemd
>+Requires(postun): systemd
>+
> %description
> LTSP Display Manager handles network logins for remote desktop sessions.
> 
>@@ -75,9 +81,21 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc <<EOL
> EOL
> chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc
> 
>+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
>+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/ldm.service
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>+%post
>+%systemd_post ldm.service
>+
>+%preun
>+%systemd_preun ldm.service
>+
>+%postun
>+%systemd_postun
>+
> %files -f ldm.lang
> %defattr(-,root,root,-) 
> %doc COPYING README
>@@ -88,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
> %{_mandir}/man1/ldm.1.gz
> %{_datadir}/ltsp/screen.d/ldm
> %dir %{_localstatedir}/run/ldm/
>+%{_unitdir}/ldm.service
> 
> %files -n ldminfod
> %{_sbindir}/ldminfod
>@@ -95,6 +114,11 @@ rm -rf $RPM_BUILD_ROOT
> %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
> 
> %changelog
>+* Tue Aug  7 2012 Lennart Poettering <lpoetter@redhat.com> - 2.0.46-6
>+- Display manager rework
>+- https://fedoraproject.org/wiki/Features/DisplayManagerRework
>+- https://bugzilla.redhat.com/show_bug.cgi?id=846147
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.46-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.11.2
>

Actions: View | Diff

Attachments on bug 846147: 602727