From a5e309cc3505c419a7f3274ca1a72210c788edb7 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 11 Aug 2015 15:50:09 +0200 Subject: [PATCH 1/2] ignore failed plymouth --- package/YaST2-Second-Stage.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/YaST2-Second-Stage.service b/package/YaST2-Second-Stage.service index 2d5bcf1f3..88ee50a91 100644 --- a/package/YaST2-Second-Stage.service +++ b/package/YaST2-Second-Stage.service @@ -20,7 +20,7 @@ Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux PX_MODULE_PATH="" # 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=-/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' ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 From 304b40fc238b32a3dee9f6cf1e683886d51c1831 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 11 Aug 2015 15:52:50 +0200 Subject: [PATCH 2/2] packaging --- package/yast2-installation.changes | 8 ++++++++ package/yast2-installation.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index ece813375..57f9fb9d5 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 11 15:50:49 CEST 2015 - schubi@suse.de + +- AutoYaST second stage: YaST2-Second-Stage.service + Continue installation even if plymouth has returned an error. + (bnc#940878) +- 3.1.154 + ------------------------------------------------------------------- Fri Aug 7 12:53:08 UTC 2015 - igonzalezsosa@suse.com diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 3f785b3cc..ba7d976db 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.153 +Version: 3.1.154 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build