Commit 590f18a2 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

rpm: include RPM macro definition for .spec snippets

Let's try to standardize a bit the RPM macros used for
installing/uninstalling services.

This only covers the non-SysV compat bits, since that tends to vary
widely between the various distros.

Usage:

Add %{?systemd_requires} to the header of the spec file. And then:

%post
%systemd_post foobar.service

%preun
%systemd_preun foobar.service

%postun
%systemd_postun foobar.service

And, instead of the latter, in case the service shall be restarted on updates:

%postun
%systemd_postun_restart foobar.service
parent 20747498
......@@ -57,6 +57,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
......@@ -885,8 +886,12 @@ org.freedesktop.systemd1.%.xml: systemd
pkgconfigdata_DATA = \
src/core/systemd.pc
nodist_rpmmacros_DATA = \
src/core/macros.systemd
EXTRA_DIST += \
src/core/systemd.pc.in
src/core/systemd.pc.in \
src/core/macros.systemd.in
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
......@@ -3015,6 +3020,9 @@ sysctl.d/%: sysctl.d/%.in Makefile
%.pc: %.pc.in Makefile
$(SED_PROCESS)
src/core/macros.%: src/core/macros.%.in Makefile
$(SED_PROCESS)
src/%.policy.in: src/%.policy.in.in Makefile
$(SED_PROCESS)
......
......@@ -39,10 +39,6 @@ Features:
* systemctl: when stopping a service which has triggres and warning about it actually check the TriggeredBy= deps fields
* send SIGPWR to upower on resume so that it can send out its dbus signal for compat
* vtconsole: don't override kernel cmdline utf8 override setting
* journal: hook up with EFI firmware log, new kmsg logic
* falconindy: allow unescaped pathes for mount units, like "systmectl status /.mount"?
......
/macros.systemd
/systemd.pc
# -*- Mode: makefile; indent-tabs-mode: t -*- */
#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# systemd is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
# RPM macros for packages installing systemd unit files
%_unitdir @systemunitdir@
%systemd_requires \
Requires(post): systemd \
Requires(preun): systemd \
Requires(postun): systemd \
%{nil}
%systemd_post() \
if [ $1 -eq 1 ] ; then \
# Initial installation \
@rootbindir@/systemctl preset %{?*} >/dev/null 2>&1 || : \
fi \
%{nil}
%systemd_preun() \
if [ $1 -eq 0 ] ; then \
# Package removal, not upgrade \
@rootbindir@/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
@rootbindir@/systemctl stop %{?*} > /dev/null 2>&1 || : \
fi \
%{nil}
%systemd_postun() \
@rootbindir@/systemctl daemon-reload >/dev/null 2>&1 || : \
%{nil}
%systemd_postun_with_restart() \
@rootbindir@/systemctl daemon-reload >/dev/null 2>&1 || : \
if [ $1 -ge 1 ] ; then \
# Package upgrade, not uninstall \
@rootbindir@/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
fi \
%{nil}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment