Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Tue Aug 30 16:12:56 CEST 2011.
-------- --- yast2-installation/yast2-installation.changes 2011-08-12 14:02:17.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2011-08-29 12:20:50.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 12:12:55 CEST 2011 - [email protected] + +- added systemd .service files for second stage and firstboot + (from [email protected], bnc#713760) +- 2.21.15 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.21.14.tar.bz2 New: ---- YaST2-Firstboot.service YaST2-Second-Stage.service yast2-installation-2.21.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.BQkdt8/_old 2011-08-30 16:11:37.000000000 +0200 +++ /var/tmp/diff_new_pack.BQkdt8/_new 2011-08-30 16:11:37.000000000 +0200 @@ -19,16 +19,24 @@ Name: yast2-installation -Version: 2.21.14 +Version: 2.21.15 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.14.tar.bz2 +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 + 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,6 +126,7 @@ Recommends: yast2-add-on PreReq: %fillup_prereq +%{?systemd_requires} BuildArch: noarch @@ -139,7 +148,7 @@ 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 +176,30 @@ %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 +208,10 @@ /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 ++++++ YaST2-Firstboot.service ++++++ [Unit] Description=YaST2 Firstboot After=apparmor.service local-fs.target YaST2-Second-Stage.service [email protected] 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 ++++++ [Unit] Description=YaST2 Second Stage After=apparmor.service local-fs.target [email protected] 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 -> yast2-installation-2.21.15.tar.bz2 ++++++ ++++ 14802 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.14/VERSION new/yast2-installation-2.21.15/VERSION --- old/yast2-installation-2.21.14/VERSION 2011-08-12 13:58:29.000000000 +0200 +++ new/yast2-installation-2.21.15/VERSION 2011-08-29 12:15:59.000000000 +0200 @@ -1 +1 @@ -2.21.14 +2.21.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.14/src/clients/inst_mode.ycp new/yast2-installation-2.21.15/src/clients/inst_mode.ycp --- old/yast2-installation-2.21.14/src/clients/inst_mode.ycp 2011-08-12 13:57:48.000000000 +0200 +++ new/yast2-installation-2.21.15/src/clients/inst_mode.ycp 2011-08-12 14:01:41.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <[email protected]> * Lukas Ocilka <[email protected]> * - * $Id: inst_mode.ycp 62084 2010-06-02 12:00:45Z jsrain $ + * $Id: inst_mode.ycp 65328 2011-08-12 12:01:40Z jsuchome $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.14/src/clients/inst_system_analysis.ycp new/yast2-installation-2.21.15/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.21.14/src/clients/inst_system_analysis.ycp 2011-08-12 13:57:37.000000000 +0200 +++ new/yast2-installation-2.21.15/src/clients/inst_system_analysis.ycp 2011-08-12 14:01:41.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <[email protected]> * Lukas Ocilka <[email protected]> * - * $Id: inst_system_analysis.ycp 65155 2011-08-03 08:55:25Z lslezak $ + * $Id: inst_system_analysis.ycp 65328 2011-08-12 12:01:40Z jsuchome $ * */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
