From 2324aeeb894a4e328c9520214dbf6cc03dc6aa3a37c83fdfebdf8b03c94a41d5 Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Tue, 3 Feb 2015 10:25:18 +0000 Subject: [PATCH] - AutoYaST: 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 will be shown. (bnc#903682,889757,897956) OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=676 --- YaST2-Second-Stage.service | 5 ++++- yast2-installation-3.1.129.tar.bz2 | 4 ++-- yast2-installation.changes | 9 +++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index dd7f549..c3ccc10 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -15,7 +15,10 @@ Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies 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) -ExecStartPre=-/usr/bin/plymouth deactivate --hide-splash +# 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 [ `/usr/bin/systemctl get-default` = "multi-user.target" ];then /usr/bin/plymouth quit; else /usr/bin/plymouth deactivate --hide-splash; fi' ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 diff --git a/yast2-installation-3.1.129.tar.bz2 b/yast2-installation-3.1.129.tar.bz2 index a450d2b..61dcf5a 100644 --- a/yast2-installation-3.1.129.tar.bz2 +++ b/yast2-installation-3.1.129.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3827ec45c45ec7120161de507e28965bfcc633c99ed75566e64d6aa1c3af900b -size 1210473 +oid sha256:2f7a25a9b4dec1c72e485625597ec56c447605fcc41eb9d258841218d04fad2b +size 1211375 diff --git a/yast2-installation.changes b/yast2-installation.changes index a4cec6a..07062c4 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 3 11:11:49 CET 2015 - schubi@suse.de + +- AutoYaST: 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 will be + shown. + (bnc#903682,889757,897956) + ------------------------------------------------------------------- Thu Jan 29 17:10:44 UTC 2015 - jsrain@suse.cz