From e0d1fd9669ee07810cbf0aaa74452f65f58eb0a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Aug 04 2014 13:57:42 +0000 Subject: reapply presets after installing --- diff --git a/fedora-release.spec b/fedora-release.spec index 52027ec..333875f 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -5,7 +5,7 @@ Summary: Fedora release files Name: fedora-release Version: 22 -Release: 0.4 +Release: 0.5 License: MIT Group: System Environment/Base URL: http://fedoraproject.org @@ -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 @@ -158,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %license LICENSE %changelog +* Mon Aug 04 2014 Dennis Gilmore - 22-0.5 +- reapply presets after installing + * Wed Jul 23 2014 Dennis Gilmore - 22-0.4 - add patch from https://fedorahosted.org/rel-eng/ticket/5947 for server diff --git a/sources b/sources index f1890df..760253f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2df405d153acf849c81b5a9081e05958 fedora-release-22.tar.bz2 +bd6b72446662524118c5bd856b3edfbc fedora-release-22.tar.bz2