From 61eba904163d7746be06838c8718c2aec2138f43177ba773dee00a5f50095b0d Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Mon, 20 Jun 2011 07:39:29 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/systemd
 revision 40.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1721ccdb073fea908f21ed249954f548
---
 systemd.spec | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index c8c2e175..a04f0231 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -52,7 +52,6 @@ Patch1:         0001-Add-bootsplash-handling-for-password-dialogs.patch
 # in the patch. Any patches added here without a very good reason to make
 # an exception will be silently removed with the next version update.
 
-
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
 init scripts for Linux. systemd provides aggressive parallelization
@@ -69,7 +68,6 @@ Group:          System/Base
 Summary:        Graphical front-end for systemd
 Requires:       %{name} = %{version}
 
-
 %description gtk
 Graphical front-end for systemd system and service manager.
 
@@ -82,13 +80,11 @@ Provides:       sbin_init
 Conflicts:      sysvinit
 Conflicts:      upstart
 
-
 %description sysvinit
 Drop-in replacement of System V init tools.
 
 %if %{build_plymouth}
 
-
 %package plymouth
 License:        GPLv2+
 Group:          System/Base
@@ -96,17 +92,14 @@ Summary:        Plymouth support for systemd
 Requires:       %{name} = %{version}
 Requires:       plymouth
 
-
 %description plymouth
 Plymouth integration for systemd
 %endif
 
-
 %prep
 %setup -q
 %patch1 -p1
 
-
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
@@ -122,7 +115,6 @@ export V=1
 touch *.vala */*.vala
 make %{?_smp_mflags}
 
-
 %install
 %makeinstall
 find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
@@ -162,7 +154,6 @@ ln -s systemd-random-seed-load.service %{buildroot}/lib/systemd/system/random.se
 (cd %{buildroot} && find . -name '*plymouth*') > files.plymouth
 %endif
 
-
 %post
 /bin/systemd-machine-id-setup >/dev/null 2>&1 || :
 /bin/systemctl daemon-reexec >/dev/null 2>&1 || :
@@ -183,7 +174,6 @@ if [ "$1" -eq 1 ]; then
     remote-fs.target >/dev/null 2>&1 || :
 fi
 
-
 %preun
 if [ $1 -eq 0 ]; then
   /bin/systemctl disable \
@@ -194,11 +184,9 @@ if [ $1 -eq 0 ]; then
   rm -f /etc/systemd/system/default.target 2>&1 || :
 fi
 
-
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root)
 /bin/systemd
@@ -272,7 +260,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/bash_completion.d
 /etc/bash_completion.d/systemctl-bash-completion.sh
 
-
 %files gtk
 %defattr(-,root,root,-)
 %{_bindir}/systemadm
@@ -281,7 +268,6 @@ rm -rf %{buildroot}
 
 %if %{build_plymouth}
 
-
 %files plymouth
 %defattr(-,root,root,-)
 /lib/systemd/system/plymouth-*.service
@@ -289,7 +275,6 @@ rm -rf %{buildroot}
 /lib/systemd/system/systemd-ask-password-plymouth.*
 %endif
 
-
 %files sysvinit
 %defattr(-,root,root,-)
 /sbin/init
@@ -307,6 +292,4 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8*
 %{_mandir}/man8/runlevel.8*
 
-
-
 %changelog

From d024d2f241fc57fac80d0c8974f6a31f6e8b6a119d696791e3ea04358924f17b Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Wed, 29 Jun 2011 13:07:07 +0000
Subject: [PATCH 2/2] - Make sure to not start kbd initscript, it is handled by
 systemd   natively.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=158
---
 systemd.changes | 6 ++++++
 systemd.spec    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/systemd.changes b/systemd.changes
index 00d55141..27c95cb1 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com
+
+- Make sure to not start kbd initscript, it is handled by systemd
+  natively.
+
 -------------------------------------------------------------------
 Fri Jun 17 09:34:24 UTC 2011 - fcrozat@novell.com
 
diff --git a/systemd.spec b/systemd.spec
index a04f0231..31508e04 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -140,6 +140,7 @@ ln -s /dev/null %{buildroot}/lib/systemd/system/clock.service
 ln -s /dev/null %{buildroot}/lib/systemd/system/crypto.service
 ln -s /dev/null %{buildroot}/lib/systemd/system/crypto-early.service
 ln -s /dev/null %{buildroot}/lib/systemd/system/earlysyslog.service
+ln -s /dev/null %{buildroot}/lib/systemd/system/kbd.service
 ln -s /dev/null %{buildroot}/lib/systemd/system/klog.service
 ln -s /dev/null %{buildroot}/lib/systemd/system/ldconfig.service
 ln -s /dev/null %{buildroot}/lib/systemd/system/loadmodules.service