Revert "Move back again from X.Org"

This reverts commit db463270eab8f126d9557b8b9fb2312613278ae0.

3 files changed, 8 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13eeafe6b41f..0b1b958d3019 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,7 @@ pkgbase = retroarch-standalone-service
 	source = retroarch-standalone.service
 	source = retroarch-standalone.sysuser
 	source = retroarch-standalone.cfg
-	md5sums = f73e83f0b6d17f06354d7c3db840afa1
+	md5sums = 3a0ec662646862e513fe7a1cd72369b0
 	md5sums = dff58d483453816a80dcdbc8d272e8b8
 	md5sums = ac40311816ee094e98f957db77cea241
 
diff --git a/PKGBUILD b/PKGBUILD
index dcf707724d4f..248f1f78d3f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ install='retroarch-standalone.install'
 source=('retroarch-standalone.service'
         'retroarch-standalone.sysuser'
         'retroarch-standalone.cfg')
-md5sums=('f73e83f0b6d17f06354d7c3db840afa1'
+md5sums=('3a0ec662646862e513fe7a1cd72369b0'
          'dff58d483453816a80dcdbc8d272e8b8'
          'ac40311816ee094e98f957db77cea241')
 
diff --git a/retroarch-standalone.service b/retroarch-standalone.service
index f3d700290dae..75dbaea8d20e 100644
--- a/retroarch-standalone.service
+++ b/retroarch-standalone.service
@@ -1,14 +1,17 @@
 [Unit]
 Description=Systemd service and user to run Retroarch in stand-alone mode
+After=systemd-user-sessions.service network.target sound.target
+Conflicts=getty@tty1.service
 
 [Service]
 User=retroarch
 Group=retroarch
 PAMName=login
-Type=simple
-ExecStart=/usr/bin/retroarch --appendconfig=/etc/retroarch-standalone.cfg
-TimeoutStopSec=30
+TTYPath=/dev/tty1
+ExecStartPre=/usr/bin/sleep 2s
+ExecStart=/usr/bin/xinit /usr/bin/retroarch --appendconfig=/etc/retroarch-standalone.cfg -- :0 -nolisten tcp vt1
 Restart=always
+StandardInput=tty
 
 [Install]
 WantedBy=multi-user.target