forked from pool/systemd
53e4623893
update to v201 OBS-URL: https://build.opensuse.org/request/show/163799 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=363
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Thu, 10 Jan 2013 15:43:25 +0000
|
|
Subject: allow multiple sulogin to be started
|
|
|
|
allows multiple sulogin instance (bnc#793182).
|
|
---
|
|
units/getty@.service.m4 | 1 +
|
|
units/rescue.target | 1 +
|
|
units/serial-getty@.service.m4 | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
|
|
index 083eb97..243fea5 100644
|
|
--- a/units/getty@.service.m4
|
|
+++ b/units/getty@.service.m4
|
|
@@ -9,6 +9,7 @@
|
|
Description=Getty on %I
|
|
Documentation=man:agetty(8) man:systemd-getty-generator(8)
|
|
Documentation=http://0pointer.de/blog/projects/serial-console.html
|
|
+Conflicts=rescue.service
|
|
After=systemd-user-sessions.service plymouth-quit-wait.service
|
|
m4_ifdef(`HAVE_SYSV_COMPAT',
|
|
After=rc-local.service
|
|
diff --git a/units/rescue.target b/units/rescue.target
|
|
index 3f59b14..20f6841 100644
|
|
--- a/units/rescue.target
|
|
+++ b/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]
|
|
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
|
|
index 60d7737..2b18dbf 100644
|
|
--- a/units/serial-getty@.service.m4
|
|
+++ b/units/serial-getty@.service.m4
|
|
@@ -10,6 +10,7 @@ Description=Serial Getty on %I
|
|
Documentation=man:agetty(8) man:systemd-getty-generator(8)
|
|
Documentation=http://0pointer.de/blog/projects/serial-console.html
|
|
BindsTo=dev-%i.device
|
|
+Conflicts=rescue.service
|
|
After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
|
|
m4_ifdef(`HAVE_SYSV_COMPAT',
|
|
After=rc-local.service
|