Author: fcrozat Date: Fri Oct 7 14:27:25 2011 New Revision: 66328 URL: http://svn.opensuse.org/viewcvs/yast?rev=66328&view=rev Log: - use latest systemd macros - remove workaround for systemd service, fixed in systemd Modified: trunk/installation/package/YaST2-Firstboot.service trunk/installation/package/YaST2-Second-Stage.service trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/YaST2-Firstboot.service URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/YaST2-Firstboot.service?rev=66328&r1=66327&r2=66328&view=diff ============================================================================== --- trunk/installation/package/YaST2-Firstboot.service (original) +++ trunk/installation/package/YaST2-Firstboot.service Fri Oct 7 14:27:25 2011 @@ -2,15 +2,12 @@ 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 -ConditionPathExists=|/run/systemd/keep_running +ConditionPathExists=/var/lib/YaST2/reconfig_system [Service] Type=oneshot -ExecStartPre=/bin/touch /run/systemd/keep_running ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system -ExecStartPost=/bin/rm -f /run/systemd/keep_running TimeoutSec=0 RemainAfterExit=true Modified: trunk/installation/package/YaST2-Second-Stage.service URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/YaST2-Second-Stage.service?rev=66328&r1=66327&r2=66328&view=diff ============================================================================== --- trunk/installation/package/YaST2-Second-Stage.service (original) +++ trunk/installation/package/YaST2-Second-Stage.service Fri Oct 7 14:27:25 2011 @@ -2,17 +2,14 @@ Description=YaST2 Second Stage After=apparmor.service local-fs.target Before=getty@tty1.service xdm.service -ConditionPathExists=|/var/lib/YaST2/runme_at_boot -ConditionPathExists=|/run/systemd/keep_running +ConditionPathExists=/var/lib/YaST2/runme_at_boot [Service] Type=oneshot -ExecStart=/bin/touch /run/systemd/keep_running ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot -ExecStartPost=/bin/rm -f /run/systemd/keep_running [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=66328&r1=66327&r2=66328&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Oct 7 14:27:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 7 11:38:39 UTC 2011 - fcrozat@suse.com + +- Use latest macros for systemd +- Drop workaround for bnc#719221, systemd is fixed now. + +------------------------------------------------------------------- Fri Oct 7 11:30:21 UTC 2011 - jsrain@suse.cz - change the URL for congratulation dialog (bnc#720481) Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=66328&r1=66327&r2=66328&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Oct 7 14:27:25 2011 @@ -140,15 +140,12 @@ %if 0%{suse_version} > 1140 -%service_add YaST2-Second-Stage.service YaST2-Firstboot.service +%service_add_post 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 || : +%pre +%service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service %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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org