ignoring return value of plymouth

yast · Aug 19, 2015 · e802118 · e802118
1 parent 23ec35e
commit e802118
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/YaST2-Second-Stage.service b/package/YaST2-Second-Stage.service
@@ -13,7 +13,7 @@ Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
 # 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'
+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/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug 19 15:34:47 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.116.5
+
 -------------------------------------------------------------------
 Mon Jul 20 17:15:53 UTC 2015 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.116.4
+Version:        3.1.116.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build