Stephan Kulow 2012-06-26 18:07:21 +00:00 committed by Git OBS Bridge
commit e3fced79f6
6 changed files with 67 additions and 61 deletions

View File

@ -1,12 +1,13 @@
[Unit] [Unit]
Description=YaST2 Firstboot 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 Before=getty@tty1.service xdm.service network.service NetworkManager.service
ConditionPathExists=/var/lib/YaST2/reconfig_system ConditionPathExists=/var/lib/YaST2/reconfig_system
[Service] [Service]
Type=oneshot Type=oneshot
Environment=SYSTEMD_NO_WRAP=1 Environment=SYSTEMD_NO_WRAP=1
ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
TimeoutSec=0 TimeoutSec=0

View File

@ -1,12 +1,13 @@
[Unit] [Unit]
Description=YaST2 Second Stage Description=YaST2 Second Stage
After=apparmor.service local-fs.target After=apparmor.service local-fs.target plymouth-start.service
Before=getty@tty1.service xdm.service network.service NetworkManager.service Before=getty@tty1.service xdm.service network.service NetworkManager.service SuSEfirewall2_init.service
ConditionPathExists=/var/lib/YaST2/runme_at_boot ConditionPathExists=/var/lib/YaST2/runme_at_boot
[Service] [Service]
Type=oneshot Type=oneshot
Environment=SYSTEMD_NO_WRAP=1 Environment=SYSTEMD_NO_WRAP=1
ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes RemainAfterExit=yes
TimeoutSec=0 TimeoutSec=0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:506aec9083fbfbdf17fcb887ad3bf85be32d3b3fa438864e77e403d99e932518
size 283883

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9686dc0553e2e33df92fa566890bd5dba30bb96dbebe6c921752474f59066472
size 284113

View File

@ -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 Wed Jun 6 11:27:02 CEST 2012 - jsuchome@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package yast2-installation # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,28 +17,21 @@
Name: yast2-installation Name: yast2-installation
Version: 2.22.7 Version: 2.22.8
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-%{version}.tar.bz2 Source0: yast2-installation-%{version}.tar.bz2
Summary: YaST2 - Installation Parts
License: GPL-2.0
Group: System/YaST Group: System/YaST
License: GPL-2.0
Summary: YaST2 - Installation Parts
Source1: YaST2-Second-Stage.service Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service Source2: YaST2-Firstboot.service
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
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
# FileSystems::possible_root_fs # FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12 BuildRequires: yast2-storage >= 2.19.12
@ -108,9 +101,8 @@ Conflicts: yast2-core < 2.17.10
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) # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
Requires: tar gzip
Requires: coreutils Requires: coreutils
Requires: gzip
Requires: tar
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: systemd-devel BuildRequires: systemd-devel
@ -140,12 +132,12 @@ PreReq: %fillup_prereq
BuildArch: noarch BuildArch: noarch
%package devel-doc %package devel-doc
Group: Documentation/HTML
Requires: yast2-installation >= 2.15.34 Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq PreReq: %fillup_prereq
Summary: YaST2 - Installation Parts Summary: YaST2 - Installation Parts
Group: Documentation/HTML
%description %description
System installation code as present on installation media. System installation code as present on installation media.
@ -254,5 +246,3 @@ rm -rf "$RPM_BUILD_ROOT"
%doc %{_prefix}/share/doc/packages/yast2-installation %doc %{_prefix}/share/doc/packages/yast2-installation
%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{_prefix}/share/doc/packages/yast2-installation/README %exclude %{_prefix}/share/doc/packages/yast2-installation/README
%changelog