diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service new file mode 100644 index 0000000..db15bf1 --- /dev/null +++ b/YaST2-Firstboot.service @@ -0,0 +1,15 @@ +[Unit] +Description=YaST2 Firstboot +After=apparmor.service local-fs.target YaST2-Second-Stage.service +Before=getty@tty1.service xdm.service +ConditionPathExists=/var/lib/YaST2/reconfig_system + +[Service] +Type=oneshot +#TTYPath=/var/lib/YaST2/run_suseconfig +#StandardOutput=tty +ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot +ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system + +[Install] +WantedBy=default.target diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service new file mode 100644 index 0000000..a55c838 --- /dev/null +++ b/YaST2-Second-Stage.service @@ -0,0 +1,13 @@ +[Unit] +Description=YaST2 Second Stage +After=apparmor.service local-fs.target +Before=getty@tty1.service xdm.service +ConditionPathExists=/var/lib/YaST2/runme_at_boot + +[Service] +Type=oneshot +ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage +ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot + +[Install] +WantedBy=default.target diff --git a/yast2-installation-2.21.14.tar.bz2 b/yast2-installation-2.21.14.tar.bz2 deleted file mode 100644 index f9f4eeb..0000000 --- a/yast2-installation-2.21.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9924b9419461f585755988586c87f79d2cf51052fbb338491fad2c9f2bcb1e81 -size 312783 diff --git a/yast2-installation-2.21.15.tar.bz2 b/yast2-installation-2.21.15.tar.bz2 new file mode 100644 index 0000000..ea2290a --- /dev/null +++ b/yast2-installation-2.21.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4865352059715257916f7e926c66112ecb3942bf210ddced0dbb7411567a9459 +size 284539 diff --git a/yast2-installation.changes b/yast2-installation.changes index d6d30f9..8cee2ed 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 29 12:12:55 CEST 2011 - jsuchome@suse.cz + +- added systemd .service files for second stage and firstboot + (from fcrozat@suse.com, bnc#713760) +- 2.21.15 + ------------------------------------------------------------------- Fri Aug 12 13:58:01 CEST 2011 - jsuchome@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 6b7d2b0..54d4aa5 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,81 +1,76 @@ # -# spec file for package yast2-installation +# spec file for package yast2-installation (Version 2.21.15) # -# 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - # norootforbuild -Name: yast2-installation -Version: 2.21.14 -Release: 1 +Name: yast2-installation +Version: 2.21.15 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.14.tar.bz2 -Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.21.15.tar.bz2 + +prefix: /usr + +Group: System/YaST +License: GPL v2 or later + +Source1: YaST2-Second-Stage.service +Source2: YaST2-Firstboot.service + +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-devel +%endif -Group: System/YaST -License: GPL v2 or later 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 # Only in inst-sys # Requires: yast2-network @@ -84,20 +79,20 @@ Requires: initviocons # 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: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils # for the first/second stage of installation # currently not used @@ -106,31 +101,31 @@ Requires: coreutils #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 +%{?systemd_requires} -BuildArch: noarch +BuildArchitectures: noarch -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %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 %description System installation code as present on installation media. @@ -139,7 +134,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.14 +%setup -n yast2-installation-2.21.15 %build %{prefix}/bin/y2tool y2autoconf @@ -167,12 +162,30 @@ for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; d %suse_update_desktop_file $f done +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir} +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir} + %clean rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -ns security checksig} +%service_add YaST2-Second-Stage.service YaST2-Firstboot.service + +/bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || : +/bin/systemctl enable YaST2-Firstboot.service > /dev/null 2>&1 || : + +%preun +if [ $1 -eq 0 ]; then + /bin/systemctl disable YaST2-Second-Stage.service YaST2-Firstboot.service > /dev/null 2>&1 || : +fi +%service_del_preun YaST2-Second-Stage.service YaST2-Firstboot.service + +%postun +%service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service + %files %defattr(-,root,root) %dir /usr/share/YaST2/control @@ -181,6 +194,10 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc +# systemd service files +%_unitdir/YaST2-Second-Stage.service +%_unitdir/YaST2-Firstboot.service + /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc @@ -220,4 +237,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