Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust plymouth and First, Second stage start order. #1070

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions package/YaST2-Firstboot.service
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[Unit]
Description=YaST2 Firstboot
After=apparmor.service local-fs.target plymouth-start.service YaST2-Second-Stage.service
After=apparmor.service local-fs.target plymouth-quit-wait.service YaST2-Second-Stage.service
# Run after kernels are purged to prevent a zypper lock (bsc#1196431)
After=purge-kernels.service
Conflicts=plymouth-start.service
[email protected] [email protected] [email protected] [email protected]
[email protected] [email protected]
Before=display-manager.service
Expand All @@ -13,7 +12,6 @@ OnFailure=shutdown.target
[Service]
Type=oneshot
Environment=TERM=linux
ExecStartPre=/bin/sh -c "/usr/bin/plymouth quit 2>/dev/null || :"
ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/reconfig_system
ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service
Expand Down
5 changes: 1 addition & 4 deletions package/YaST2-Second-Stage.service
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[Unit]
Description=YaST2 Second Stage
After=apparmor.service local-fs.target plymouth-start.service
After=apparmor.service local-fs.target plymouth-quit-wait.service
# Run after kernels are purged to prevent a zypper lock (bsc#1196431)
After=purge-kernels.service
Conflicts=plymouth-start.service
# Prevent getty auto-generation (bsc#1196614, bsc#1196594, bsc#1199746)
[email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
[email protected] [email protected] [email protected]
Expand All @@ -21,8 +20,6 @@ Type=oneshot
# and envvar extensions are still loaded, /etc/sysconfig/proxy values are still
# 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/plymouth quit
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
TimeoutSec=0
Expand Down