Skip to content

Commit

Permalink
Merge branch 'SLE-15-SP4' into merge_SLE-15-SP4
Browse files Browse the repository at this point in the history
  • Loading branch information
teclator committed Jul 27, 2022
2 parents 36d1388 + c552952 commit f14bbe5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 0 additions & 4 deletions package/YaST2-Second-Stage.service
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[Unit]
Description=YaST2 Second Stage
After=apparmor.service local-fs.target plymouth-start.service
# systemd-user-sessions is needed to allow ssh connection (bsc#1195059)
After=systemd-user-sessions.service
# Run after kernels are purged to prevent a zypper lock (bsc#1196431)
After=purge-kernels.service
Conflicts=plymouth-start.service
Expand All @@ -24,15 +22,13 @@ Type=oneshot
# used correctly (see bnc#866692 and bnc#866692 for details).
Environment=TERM=linux PX_MODULE_PATH=""
# Block non-privileged user login (bsc#1195059)
ExecStartPre=-/usr/bin/touch /run/nologin
ExecStartPre=-/usr/bin/plymouth quit
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
TimeoutSec=0
# Initialize tty1 in order to remove old YaST output and to show the cursor
# again (bnc#1018037)
ExecStartPost=/bin/sh -c '/usr/bin/printf "\033c" > /dev/tty1'
ExecStartPost=/usr/bin/rm -f /run/nologin
ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/runme_at_boot
ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service
StandardInput=tty
Expand Down
8 changes: 8 additions & 0 deletions package/yast2-installation.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 22 11:35:42 UTC 2022 - Knut Anderssen <kanderssen@suse.com>

- AutoYaST SecondStage: Revert changes introduced in 4.3.46 running
the initscript service before systemd-user-sessions again once
systemd patched logind (bsc#1195059, bsc#1200780)
- 4.5.5

-------------------------------------------------------------------
Mon Jul 18 16:05:26 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-installation.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

Name: yast2-installation
Version: 4.5.4
Version: 4.5.5
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
Expand Down

0 comments on commit f14bbe5

Please sign in to comment.