From 4c690ace3dd98b6e770fad0e0f7a251d1f38c86473f629838d9a62f3d8ecabd0 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Wed, 25 Apr 2012 08:34:49 +0000
Subject: [PATCH 1/2] - Add fix-getty-isolate.patch: don't quit getty when
 changing   runlevel (bnc#746594)

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=271
---
 fix-getty-isolate.patch | 51 +++++++++++++++++++++++++++++++++++++++++
 systemd.changes         |  6 +++++
 systemd.spec            |  2 ++
 3 files changed, 59 insertions(+)
 create mode 100644 fix-getty-isolate.patch

diff --git a/fix-getty-isolate.patch b/fix-getty-isolate.patch
new file mode 100644
index 0000000..4cf794a
--- /dev/null
+++ b/fix-getty-isolate.patch
@@ -0,0 +1,51 @@
+From 4771148bb92ace55eaa6759a53d04a0f2de9b0d2 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Wed, 11 Apr 2012 21:58:33 +0200
+Subject: [PATCH] units: exclude gettys from isolate requests
+
+gettys are nowadays mostly autospawned and hence usually subject to
+being shut down on isolate requests, since they are no dependency of any
+other unit. This is a bad idea if the user isolates between
+multi-user.graphical and graphical.target, hence exclude them from the
+isolation.
+
+This has the effect that gettys no longer cleaned up when
+emergency.target is isolated, which might actualy be considered a
+feature, even though it is a change from previous behaviour...
+
+Note that the one getty that really matters (the one on tty1) is still
+removed when isolating to emergency.target since it conflicts with
+emergency.service.
+---
+ TODO                           |    4 ++--
+ units/getty@.service.m4        |    1 +
+ units/serial-getty@.service.m4 |    1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
+index a02838d..6b931fb 100644
+--- a/units/getty@.service.m4
++++ b/units/getty@.service.m4
+@@ -32,6 +32,7 @@ After=rc-local.service
+ # sure that this is synchronized before getty.target, even though
+ # getty.target didn't actually pull it in.
+ Before=getty.target
++IgnoreOnIsolate=yes
+ 
+ [Service]
+ Environment=TERM=linux
+diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
+index fc8b57b..d1d14d3 100644
+--- a/units/serial-getty@.service.m4
++++ b/units/serial-getty@.service.m4
+@@ -32,6 +32,7 @@ After=rc-local.service
+ # sure that this is synchronized before getty.target, even though
+ # getty.target didn't actually pull it in.
+ Before=getty.target
++IgnoreOnIsolate=yes
+ 
+ [Service]
+ Environment=TERM=vt100
+-- 
+1.7.7
+
diff --git a/systemd.changes b/systemd.changes
index 10da2aa..49a9708 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 24 15:46:54 UTC 2012 - fcrozat@suse.com
+
+- Add fix-getty-isolate.patch: don't quit getty when changing
+  runlevel (bnc#746594)
+
 -------------------------------------------------------------------
 Fri Apr 20 17:16:37 CEST 2012 - sbrabec@suse.cz
 
diff --git a/systemd.spec b/systemd.spec
index 7262e9c..f67da68 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -92,6 +92,7 @@ Patch41:        0001-add-sparse-support-to-detect-endianness-bug.patch
 Patch40:        0001-util-never-follow-symlinks-in-rm_rf_children.patch
 Patch42:        fixppc.patch
 Patch43:        logind-logout.patch
+Patch44:        fix-getty-isolate.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -155,6 +156,7 @@ Plymouth integration for systemd
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
 
 %build
 autoreconf -fiv

From 486f37b1b04c5bc28be5aa02346cb79d01ba9d8b29e130f8420cb959347b7d08 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Thu, 3 May 2012 11:41:40 +0000
Subject: [PATCH 2/2] - Disable logind-logout.patch: it crashes sudo session
 (if called   after su -l) (bnc#746704).

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

diff --git a/systemd.changes b/systemd.changes
index 49a9708..f1a5ed6 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  3 11:40:20 UTC 2012 - fcrozat@suse.com
+
+- Disable logind-logout.patch: it crashes sudo session (if called
+  after su -l) (bnc#746704).
+
 -------------------------------------------------------------------
 Tue Apr 24 15:46:54 UTC 2012 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index f67da68..0ebba0b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -155,7 +155,8 @@ Plymouth integration for systemd
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
-%patch43 -p1
+# disabled for now, cause sudo session to terminate
+#patch43 -p1
 %patch44 -p1
 
 %build