diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service index fb36d1c..55180b9 100644 --- a/YaST2-Firstboot.service +++ b/YaST2-Firstboot.service @@ -1,12 +1,13 @@ [Unit] Description=YaST2 Firstboot -After=apparmor.service local-fs.target YaST2-Second-Stage.service +After=apparmor.service local-fs.target YaST2-Second-Stage.service plymouth-start.service Before=getty@tty1.service xdm.service network.service NetworkManager.service ConditionPathExists=/var/lib/YaST2/reconfig_system [Service] Type=oneshot Environment=SYSTEMD_NO_WRAP=1 +ExecStartPre=-/usr/bin/plymouth --hide-splash ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system TimeoutSec=0 diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index 1278680..91d30b2 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -1,12 +1,13 @@ [Unit] Description=YaST2 Second Stage -After=apparmor.service local-fs.target -Before=getty@tty1.service xdm.service network.service NetworkManager.service +After=apparmor.service local-fs.target plymouth-start.service +Before=getty@tty1.service xdm.service network.service NetworkManager.service SuSEfirewall2_init.service ConditionPathExists=/var/lib/YaST2/runme_at_boot [Service] Type=oneshot Environment=SYSTEMD_NO_WRAP=1 +ExecStartPre=-/usr/bin/plymouth --hide-splash ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 diff --git a/yast2-installation-2.22.7.tar.bz2 b/yast2-installation-2.22.7.tar.bz2 deleted file mode 100644 index 4ebb619..0000000 --- a/yast2-installation-2.22.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:506aec9083fbfbdf17fcb887ad3bf85be32d3b3fa438864e77e403d99e932518 -size 283883 diff --git a/yast2-installation-2.22.8.tar.bz2 b/yast2-installation-2.22.8.tar.bz2 new file mode 100644 index 0000000..1c59312 --- /dev/null +++ b/yast2-installation-2.22.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9686dc0553e2e33df92fa566890bd5dba30bb96dbebe6c921752474f59066472 +size 284113 diff --git a/yast2-installation.changes b/yast2-installation.changes index b55d471..b24846b 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 25 15:43:43 CEST 2012 - jsuchome@suse.cz + +- ensure Plymouth is hiddent before 2nd start, to prevent system + freeze (bnc#768185) +- ensure 2nd stage is started before SuSEfirewall2_init (bnc#733361) +- 2.22.8 + +------------------------------------------------------------------- +Tue Jun 19 14:49:52 CEST 2012 - aschnell@suse.de + +- kill console before reboot (bnc#759627) + (otherwise systemd will not proceed with system shutdown) + ------------------------------------------------------------------- Wed Jun 6 11:27:02 CEST 2012 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 17021b6..9b241aa 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,74 +17,67 @@ Name: yast2-installation -Version: 2.22.7 +Version: 2.22.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 -Summary: YaST2 - Installation Parts -License: GPL-2.0 + Group: System/YaST +License: GPL-2.0 +Summary: YaST2 - Installation Parts -Source1: YaST2-Second-Stage.service -Source2: YaST2-Firstboot.service +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service -BuildRequires: docbook-xsl-stylesheets -BuildRequires: doxygen -BuildRequires: libxslt -BuildRequires: perl-XML-Writer -BuildRequires: sgml-skel -BuildRequires: update-desktop-files -BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools -BuildRequires: yast2-testsuite +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::Add/RemoveUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.21.2 +BuildRequires: yast2-pkg-bindings >= 2.21.2 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Pkg::Add/RemoveUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.21.2 +Requires: yast2-pkg-bindings >= 2.21.2 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Proxy settings for 2nd stage (bnc#764951) Requires: yast2-proxy @@ -96,24 +89,23 @@ Requires: yast2-proxy # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: coreutils -Requires: gzip -Requires: tar +Requires: tar gzip +Requires: coreutils %if 0%{?suse_version} >= 1210 -BuildRequires: systemd-devel +BuildRequires: systemd-devel %{systemd_requires} %endif @@ -124,28 +116,28 @@ BuildRequires: systemd-devel #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArch: noarch +BuildArch: noarch %package devel-doc -Requires: yast2-installation >= 2.15.34 - -PreReq: %fillup_prereq - -Summary: YaST2 - Installation Parts Group: Documentation/HTML +Requires: yast2-installation >= 2.15.34 + +PreReq: %fillup_prereq + +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -254,5 +246,3 @@ rm -rf "$RPM_BUILD_ROOT" %doc %{_prefix}/share/doc/packages/yast2-installation %exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{_prefix}/share/doc/packages/yast2-installation/README - -%changelog