diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | src/core/.gitignore | 1 | ||||
| -rw-r--r-- | src/core/macros.systemd.in | 55 |
4 files changed, 65 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 77b4aa74ee..4616b30f7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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"? diff --git a/src/core/.gitignore b/src/core/.gitignore index eef2e5971e..f293bbdc93 100644 --- a/src/core/.gitignore +++ b/src/core/.gitignore @@ -1 +1,2 @@ +/macros.systemd /systemd.pc diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in new file mode 100644 index 0000000000..86e869307c --- /dev/null +++ b/src/core/macros.systemd.in @@ -0,0 +1,55 @@ +# -*- 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} |