Accepting request 90129 from Base:System

- Fix rpm macros to only call presets on initial install
  (bnc#728104). (forwarded request 90127 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/90129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=80
This commit is contained in:
Stephan Kulow 2011-11-05 10:27:37 +00:00 committed by Git OBS Bridge
parent 17e0c6ab98
commit 9f338aa7f4
3 changed files with 15 additions and 2 deletions

View File

@ -60,11 +60,12 @@ for service in %{?*} ; do \
touch "/var/lib/systemd/migrated/$sysv_service" \ touch "/var/lib/systemd/migrated/$sysv_service" \
fi \ fi \
done \ done \
/bin/systemctl daemon-reload >/dev/null 2>&1 || : \
if [ -n "$services_to_migrate" ]; then \ if [ -n "$services_to_migrate" ]; then \
/usr/sbin/systemd-sysv-convert --apply $services_to_migrate >/dev/null 2>&1 || : \ /usr/sbin/systemd-sysv-convert --apply $services_to_migrate >/dev/null 2>&1 || : \
elif [ $FIRST_ARG -eq 1 ]; then \
/bin/systemctl preset %{?*} >/dev/null 2>&1 || : \
fi \ fi \
/bin/systemctl daemon-reload >/dev/null 2>&1 || : \
/bin/systemctl preset %{?*} >/dev/null 2>&1 || : \
%{nil} %{nil}
# On uninstall, disable and stop services # On uninstall, disable and stop services

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 4 14:44:18 UTC 2011 - fcrozat@suse.com
- Fix rpm macros to only call presets on initial install
(bnc#728104).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 27 13:39:03 UTC 2011 - fcrozat@suse.com Thu Oct 27 13:39:03 UTC 2011 - fcrozat@suse.com

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 4 14:44:18 UTC 2011 - fcrozat@suse.com
- Fix rpm macros to only call presets on initial install
(bnc#728104).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 27 13:39:03 UTC 2011 - fcrozat@suse.com Thu Oct 27 13:39:03 UTC 2011 - fcrozat@suse.com