Author: jsuchome Date: Tue Aug 30 11:34:50 2011 New Revision: 65438 URL: http://svn.opensuse.org/viewcvs/yast?rev=65438&view=rev Log: - added systemd .service files for second stage and firstboot (from fcrozat@suse.com, bnc#713760) - 2.21.15 Added: trunk/installation/package/YaST2-Firstboot.service trunk/installation/package/YaST2-Second-Stage.service Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=65438&r1=65437&r2=65438&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Aug 30 11:34:50 2011 @@ -1 +1 @@ -2.21.14 +2.21.15 Added: trunk/installation/package/YaST2-Firstboot.service URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/YaST2-Firstboot.service?rev=65438&view=auto ============================================================================== --- trunk/installation/package/YaST2-Firstboot.service (added) +++ trunk/installation/package/YaST2-Firstboot.service Tue Aug 30 11:34:50 2011 @@ -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 Added: trunk/installation/package/YaST2-Second-Stage.service URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/YaST2-Second-Stage.service?rev=65438&view=auto ============================================================================== --- trunk/installation/package/YaST2-Second-Stage.service (added) +++ trunk/installation/package/YaST2-Second-Stage.service Tue Aug 30 11:34:50 2011 @@ -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 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=65438&r1=65437&r2=65438&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Aug 30 11:34:50 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +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 - expect there might me extra checks for disk controllers with Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=65438&r1=65437&r2=65438&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Aug 30 11:34:50 2011 @@ -4,6 +4,15 @@ @HEADER@ 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 +%{systemd_requires} +%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 @@ -121,11 +130,29 @@ %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@ %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 @@ -134,6 +161,10 @@ /usr/share/YaST2/control/*.rng /usr/share/YaST2/control/*.rnc +# systemd service files +%_unitdir/YaST2-Second-Stage.service +%_unitdir/YaST2-Firstboot.service + @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org