From b552dbe916aae6a2c6642232f9755342dbd510c4873f63380d75acb8fa0c31b8 Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Thu, 18 Jan 2018 13:21:57 +0000 Subject: [PATCH] - Update YaST2-Firstboot.service: Depreciate plymouth --wait, add conflict to plymouth start service. - Update YaST2-Second-Stage.service: Depreciate plymouth deactivate command and add conflict to plymouth start service. For that will block TTY device activation(bsc#1042554). - 4.0.23 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=926 --- YaST2-Firstboot.service | 2 +- YaST2-Second-Stage.service | 9 ++------- yast2-installation-4.0.22.tar.bz2 | 3 --- yast2-installation-4.0.23.tar.bz2 | 3 +++ yast2-installation.changes | 10 ++++++++++ yast2-installation.spec | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 yast2-installation-4.0.22.tar.bz2 create mode 100644 yast2-installation-4.0.23.tar.bz2 diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service index 753b6e7..08fd032 100644 --- a/YaST2-Firstboot.service +++ b/YaST2-Firstboot.service @@ -1,6 +1,7 @@ [Unit] Description=YaST2 Firstboot After=apparmor.service local-fs.target plymouth-start.service YaST2-Second-Stage.service +Conflicts=plymouth-start.service Before=getty@tty1.service serial-getty@ttyS0.service serial-getty@ttyS1.service serial-getty@ttyS2.service Before=display-manager.service ConditionPathExists=/var/lib/YaST2/reconfig_system @@ -9,7 +10,6 @@ ConditionPathExists=/var/lib/YaST2/reconfig_system Type=oneshot Environment=TERM=linux ExecStartPre=-/usr/bin/plymouth quit -ExecStartPre=-/usr/bin/plymouth --wait 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 diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index 91ef309..85d042b 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -3,6 +3,7 @@ Description=YaST2 Second Stage # If xinetd is enabled, make sure it's already running so we can stop it during # initialization of the VNC server After=apparmor.service local-fs.target plymouth-start.service +Conflicts=plymouth-start.service Before=getty@tty1.service serial-getty@ttyS0.service serial-getty@ttyS1.service serial-getty@ttyS2.service Before=display-manager.service ConditionPathExists=/var/lib/YaST2/runme_at_boot @@ -15,13 +16,7 @@ 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="" -# Workaround of bug in plymouth --> using deactivate option -# in second boot stage in order to start ncurses yast correctly -# (bnc#886488) -# If the system starts in multi-user mode plymouth will be quit while -# installation in order to ensure that installation will be finished on -# console 1 and the login prompt. (bnc#903682,889757,897956) -ExecStartPre=-/bin/sh -c 'if [ -x /usr/bin/plymouth ] ; then if [ `/usr/bin/systemctl get-default` = "multi-user.target" ];then /usr/bin/plymouth quit; else /usr/bin/plymouth deactivate --hide-splash; fi; fi' +ExecStartPre=-/usr/bin/plymouth quit ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 diff --git a/yast2-installation-4.0.22.tar.bz2 b/yast2-installation-4.0.22.tar.bz2 deleted file mode 100644 index b84c9a2..0000000 --- a/yast2-installation-4.0.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e7f90834162bf7f648ba7a833649edddee0406da4144f502e0d9e7b18abadb0 -size 452017 diff --git a/yast2-installation-4.0.23.tar.bz2 b/yast2-installation-4.0.23.tar.bz2 new file mode 100644 index 0000000..b24ac70 --- /dev/null +++ b/yast2-installation-4.0.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea4a14769fcfffd6d5c53757161ca2c7cc91e82cdbf2edf843a359db3709c643 +size 452205 diff --git a/yast2-installation.changes b/yast2-installation.changes index 8785582..e31fd4b 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 18 12:48:55 UTC 2018 - qzhao@suse.com + +- Update YaST2-Firstboot.service: Depreciate plymouth --wait, add + conflict to plymouth start service. +- Update YaST2-Second-Stage.service: Depreciate plymouth deactivate + command and add conflict to plymouth start service. For that will + block TTY device activation(bsc#1042554). +- 4.0.23 + ------------------------------------------------------------------- Wed Jan 10 14:32:39 UTC 2018 - igonzalezsosa@suse.com diff --git a/yast2-installation.spec b/yast2-installation.spec index 0eafc08..d0c165f 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.0.22 +Version: 4.0.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build