From 4dc32ca3f95c5dc2f7b23a77c8cddb8f777bf1695f890b2e30164265d0b16d7e Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Tue, 11 Aug 2015 14:25:30 +0000 Subject: [PATCH] - AutoYaST second stage: YaST2-Second-Stage.service Continue installation even if plymouth has returned an error. (bnc#940878) - 3.1.154 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=732 --- YaST2-Second-Stage.service | 2 +- yast2-installation-3.1.153.tar.bz2 | 3 --- yast2-installation-3.1.154.tar.bz2 | 3 +++ yast2-installation.changes | 8 ++++++++ yast2-installation.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 yast2-installation-3.1.153.tar.bz2 create mode 100644 yast2-installation-3.1.154.tar.bz2 diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index 873c6c3..29e502e 100644 --- a/YaST2-Second-Stage.service +++ b/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 diff --git a/yast2-installation-3.1.153.tar.bz2 b/yast2-installation-3.1.153.tar.bz2 deleted file mode 100644 index 0d46351..0000000 --- a/yast2-installation-3.1.153.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28f2fa822c20a9dd72a21d86533706a654519aa425f2c5e326598ba6feb885f8 -size 394765 diff --git a/yast2-installation-3.1.154.tar.bz2 b/yast2-installation-3.1.154.tar.bz2 new file mode 100644 index 0000000..f6d070f --- /dev/null +++ b/yast2-installation-3.1.154.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdc7364f0a0bf54bfd06fbf0357de0b7d04859bc6859d58fac8e6557ce98a991 +size 394861 diff --git a/yast2-installation.changes b/yast2-installation.changes index 9b2c09b..8d284b9 100644 --- a/yast2-installation.changes +++ b/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/yast2-installation.spec b/yast2-installation.spec index d703c02..aa629c2 100644 --- a/yast2-installation.spec +++ b/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