Accepting request 80220 from YaST:Head

- added systemd .service files for second stage and firstboot
  (from fcrozat@suse.com, bnc#713760)
- 2.21.15

OBS-URL: https://build.opensuse.org/request/show/80220
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=211

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

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

yast2-installation-2.21.14.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9924b9419461f585755988586c87f79d2cf51052fbb338491fad2c9f2bcb1e81
-size 312783

yast2-installation-2.21.15.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4865352059715257916f7e926c66112ecb3942bf210ddced0dbb7411567a9459
+size 284539

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
 

yast2-installation.spec

@@ -1,34 +1,29 @@
 #
-# 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
+Version:	2.21.15
-Release:        1
+Release:	0
+
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-installation-2.21.14.tar.bz2
+Source0:	yast2-installation-2.21.15.tar.bz2
 
-Prefix:         /usr
+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
+
 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
@@ -118,13 +113,13 @@ Recommends:     yast2-update
 Recommends:	yast2-add-on
 
 PreReq:		%fillup_prereq
+%{?systemd_requires}
 
-BuildArch:      noarch
+BuildArchitectures: noarch
 
 Summary:	YaST2 - Installation Parts
 
 %package devel-doc
-
 Group:          Documentation/HTML
 Requires:	yast2-installation >= 2.15.34
 
@@ -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