From 83f897f9631d0b8acf9f9c98b7d8975744609e44f49d050f376cdc5c1c30d5a6 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Fri, 4 Nov 2011 16:34:12 +0000 Subject: [PATCH] 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 | 5 +++-- systemd-gtk.changes | 6 ++++++ systemd.changes | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/macros.systemd b/macros.systemd index 87621abe..9cb43928 100644 --- a/macros.systemd +++ b/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 || : \ +elif [ $FIRST_ARG -eq 1 ]; then \ + /bin/systemctl preset %{?*} >/dev/null 2>&1 || : \ fi \ -/bin/systemctl daemon-reload >/dev/null 2>&1 || : \ -/bin/systemctl preset %{?*} >/dev/null 2>&1 || : \ %{nil} # On uninstall, disable and stop services diff --git a/systemd-gtk.changes b/systemd-gtk.changes index b900778c..b6076ad4 100644 --- a/systemd-gtk.changes +++ b/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 diff --git a/systemd.changes b/systemd.changes index b900778c..b6076ad4 100644 --- a/systemd.changes +++ b/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