Merge pull request #824 from yast/second_stage_service

Fix Second Stage timeout when using ssh
yast · Feb 21, 2022 · b1d462f · b1d462f
2 parents 66682fd + 085ad4c
commit b1d462f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 21 15:05:50 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
+
+- Modified init-scripts service dependencies fixing a root login
+  systemd timeout when installing with ssh (bsc#1195059)
+- 4.3.97
+
 -------------------------------------------------------------------
 Thu Jan 20 07:58:35 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.96
+Version:        4.3.97
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/scripts/autoyast-initscripts.service b/scripts/autoyast-initscripts.service
@@ -1,14 +1,15 @@
 [Unit]
 Description=Autoyast2 Init Scripts
 After=remote-fs.target network-online.target time-sync.target mail-transfer-agent.target hwscan.service ypbind.service YaST2-Second-Stage.service
-Before=systemd-user-sessions.service
 Wants=network-online.target
 
 [Service]
 Type=oneshot
 Environment=TERM=linux
+ExecStartPre=-/usr/bin/touch /run/nologin
 ExecStartPre=-/usr/bin/plymouth --hide-splash
 ExecStart=/usr/lib/YaST2/bin/autoyast-initscripts.sh
+ExecStartPost=-/usr/bin/rm -f /run/nologin
 RemainAfterExit=yes
 TimeoutSec=0