[PATCH] Update systemd config to prevent tty conflict (#681292)

["Brian C. Lane" <bcl@xxxxxxxxxx>]

The StandardInput=tty entry was preventing X from being started
from a tty other than tty1 when in runlevel 3.

Resolves: rhbz#681292
---
 init/firstboot                      |    3 +--
 systemd/firstboot-graphical.service |    8 ++++----
 systemd/firstboot-text.service      |    7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/init/firstboot b/init/firstboot
index 7286b15..29cd9fb 100755
--- a/init/firstboot
+++ b/init/firstboot
@@ -73,8 +73,7 @@ case "$1" in
         if [ "$RETVAL" -eq 0 ]; then
             action "" /bin/true
             /sbin/chkconfig firstboot off
-            /bin/systemctl disable firstboot-graphical.service >/dev/null 2>&1
-            /bin/systemctl disable firstboot-text.service >/dev/null 2>&1
+            /bin/systemctl disable firstboot-graphical.service firstboot-text.service >/dev/null 2>&1
         else
             action "" /bin/false
         fi
diff --git a/systemd/firstboot-graphical.service b/systemd/firstboot-graphical.service
index f4d6934..77f1325 100644
--- a/systemd/firstboot-graphical.service
+++ b/systemd/firstboot-graphical.service
@@ -1,17 +1,17 @@
 [Unit]
 Description=firstboot configuration program (graphical mode)
-After=livesys.service
-Before=prefdm.service
-Conflicts=firstboot-text.service
+After=livesys.service plymouth-quit.service
+Before=prefdm.service getty@xxxxxxxxxxxx
+Conflicts=firstboot-text.service plymouth-quit.service
 
 [Service]
 Environment=RUNLEVEL=5
 ExecStartPre=-/bin/plymouth quit
 ExecStart=/etc/init.d/firstboot start
 TimeoutSec=0
-StandardInput=tty
 RemainAfterExit=yes
 Type=oneshot
+SysVStartPriority=99
 
 [Install]
 WantedBy=graphical.target
diff --git a/systemd/firstboot-text.service b/systemd/firstboot-text.service
index ee4beeb..bcf59bf 100644
--- a/systemd/firstboot-text.service
+++ b/systemd/firstboot-text.service
@@ -1,16 +1,17 @@
 [Unit]
 Description=firstboot configuration program (text mode)
-After=livesys.service
-Before=getty@xxxxxxxxxxxx
+After=livesys.service plymouth-quit.service
+Before=prefdm.service getty@xxxxxxxxxxxx
 
 [Service]
 Environment=RUNLEVEL=3
 ExecStart=/etc/init.d/firstboot start
 TimeoutSec=0
-StandardInput=tty
 RemainAfterExit=yes
 Type=oneshot
 SysVStartPriority=99
+StandardInput=tty
+TTYPath=/dev/tty1
 
 [Install]
 WantedBy=multi-user.target
-- 
1.7.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list