Accepting request 90127 from home:fcrozat:systemd

- Fix rpm macros to only call presets on initial install
  (bnc#728104).

OBS-URL: https://build.opensuse.org/request/show/90127
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=223

macros.systemd

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

systemd-gtk.changes

@@ -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
 

systemd.changes

@@ -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