Accepting request 147967 from Base:System

- Add multiple-sulogin.patch: allows multiple sulogin instance
  (bnc#793182).

(please forward to Factory) (forwarded request 147937 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/147967
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=121

multiple-sulogin.patch

@@ -0,0 +1,36 @@
+Index: systemd-195/units/getty@.service.m4
+===================================================================
+--- systemd-195.orig/units/getty@.service.m4
++++ systemd-195/units/getty@.service.m4
+@@ -8,6 +8,7 @@
+ [Unit]
+ Description=Getty on %I
+ Documentation=man:agetty(8)
++Conflicts=rescue.service
+ After=systemd-user-sessions.service plymouth-quit-wait.service
+ m4_ifdef(`TARGET_FEDORA',
+ After=rc-local.service
+Index: systemd-195/units/rescue.target
+===================================================================
+--- systemd-195.orig/units/rescue.target
++++ systemd-195/units/rescue.target
+@@ -10,6 +10,7 @@ Description=Rescue Mode
+ Documentation=man:systemd.special(7)
+ Requires=sysinit.target rescue.service
+ After=sysinit.target rescue.service
++Conflicts=getty.target
+ AllowIsolate=yes
+ 
+ [Install]
+Index: systemd-195/units/serial-getty@.service.m4
+===================================================================
+--- systemd-195.orig/units/serial-getty@.service.m4
++++ systemd-195/units/serial-getty@.service.m4
+@@ -9,6 +9,7 @@
+ Description=Serial Getty on %I
+ Documentation=man:agetty(8) man:systemd-getty-generator(8)
+ BindsTo=dev-%i.device
++Conflicts=rescue.service
+ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+ m4_ifdef(`TARGET_FEDORA',
+ After=rc-local.service

systemd-mini.changes

@@ -1,5 +1,11 @@
 -------------------------------------------------------------------
-Wed Jan  9 09:43:15 UTC 2013 - rmilasan@suse.com
+Thu Jan 10 15:43:25 UTC 2013 - fcrozat@suse.com
+
+- Add multiple-sulogin.patch: allows multiple sulogin instance
+  (bnc#793182).
+
+-------------------------------------------------------------------
+Wed Jan  9 09:42:50 UTC 2013 - rmilasan@suse.com
 
 - udev: path_id - handle Hyper-V devices
   add: 1008-udev-path_id-handle-Hyper-V-devices.patch
@@ -21,7 +27,7 @@ Wed Jan  9 09:43:15 UTC 2013 - rmilasan@suse.com
   them returns an error
   add: 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch
 - udev: use usec_t and now()
-  add: 1017-udev-use-usec_t-and-now.patch 
+  add: 1017-udev-use-usec_t-and-now.patch
 
 -------------------------------------------------------------------
 Tue Jan  8 12:47:43 UTC 2013 - rmilasan@suse.com
@@ -29,7 +35,7 @@ Tue Jan  8 12:47:43 UTC 2013 - rmilasan@suse.com
 - udevd: add missing ':' to getopt_long 'e'.
   add: 1007-udevd-add-missing-to-getopt_long-e.patch
 - clean up systemd.spec, make it easy to see which are udev and
-  systemd patches.
+  systemd patches. 
 - make 'reload' and 'force-reload' LSB compliant (bnc#793936).
 
 -------------------------------------------------------------------

systemd-mini.spec

@@ -135,6 +135,8 @@ Patch64:        fix-permissions-btmp.patch
 Patch71:        fix-debugshell.patch
 # PATCH-FIX-OPENSUSE handle-root-uses-lang.patch bnc#792182 fcrozat@suse.com -- handle ROOT_USES_LANG=ctype
 Patch72:        handle-root-uses-lang.patch
+# PATCH-FIX-OPENSUSE multiple-sulogin.patch bnc#793182 fcrozat@suse.com -- handle multiple sulogin
+Patch76:        multiple-sulogin.patch
 
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
@@ -197,7 +199,7 @@ Patch1015:      1015-udev-properly-handle-symlink-removal-by-change-event.patch
 # PATCH-FIX-UPSTREAM 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch
 Patch1016:      1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch 
 # PATCH-FIX-UPSTREAM 1017-udev-use-usec_t-and-now.patch
-Patch1017:      1017-udev-use-usec_t-and-now.patch
+Patch1017:      1017-udev-use-usec_t-and-now.patch 
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -414,6 +416,7 @@ cp %{SOURCE7} m4/
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
 
 %build
 autoreconf -fiv

systemd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 10 15:43:25 UTC 2013 - fcrozat@suse.com
+
+- Add multiple-sulogin.patch: allows multiple sulogin instance
+  (bnc#793182).
+
 -------------------------------------------------------------------
 Wed Jan  9 09:42:50 UTC 2013 - rmilasan@suse.com
 

systemd.spec

@@ -130,6 +130,8 @@ Patch64:        fix-permissions-btmp.patch
 Patch71:        fix-debugshell.patch
 # PATCH-FIX-OPENSUSE handle-root-uses-lang.patch bnc#792182 fcrozat@suse.com -- handle ROOT_USES_LANG=ctype
 Patch72:        handle-root-uses-lang.patch
+# PATCH-FIX-OPENSUSE multiple-sulogin.patch bnc#793182 fcrozat@suse.com -- handle multiple sulogin
+Patch76:        multiple-sulogin.patch
 
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
@@ -409,6 +411,7 @@ cp %{SOURCE7} m4/
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
 
 %build
 autoreconf -fiv