From 6b96ca62be0e6b8e12c728b34719b063ada7e0ec Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Aug 04 2014 13:55:51 +0000 Subject: Server: re-apply presets after we are installed Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1123845 --- diff --git a/fedora-release.spec b/fedora-release.spec index 52027ec..d39f048 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -54,6 +54,8 @@ Requires: fedora-release = %{version}-%{release} Requires: systemd Requires: cockpit Requires: rolekit +Requires(post): sed +Requires(post): systemd Conflicts: fedora-release-cloud Conflicts: fedora-release-standard Conflicts: fedora-release-workstation @@ -124,6 +126,15 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/ # Fedora Server install -m 0644 80-server.preset %{buildroot}%{_prefix}/lib/systemd/system-preset/ +%post server +if [ $1 -eq 1 ] ; then + # Initial installation; fix up after %%systemd_post in packages + # possibly installed before our preset file was added + units=$(sed -n 's/^enable//p' \ + < %{_prefix}/lib/systemd/system-preset/80-server.preset) + /usr/bin/systemctl preset $units >/dev/null 2>&1 || : +fi + %clean rm -rf $RPM_BUILD_ROOT