From 8375ee9c1d365f6125e7f8c1c66bf861c38b4c40 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 17 Jan 2014 14:35:59 +0100 Subject: [PATCH] add dep to sytemd otherwise systemctl enable won't be done at nodeimage build time and so nodes are inactive --- nodemanager-lib.spec | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec index a6d15e5..2db3276 100644 --- a/nodemanager-lib.spec +++ b/nodemanager-lib.spec @@ -6,6 +6,15 @@ %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +########## use initscripts or systemd unit files to start installed services +%if "%{distro}" == "Fedora" && %{distrorelease} >= 18 +%define make_options WITH_SYSTEMD=true +%define initdir /usr/lib/systemd/system +%else +%define make_options WITH_INIT=true +%define initdir %{_initrddir} +%endif + Summary: PlanetLab Node Manager Library Name: %{name} Version: %{version} @@ -23,6 +32,11 @@ URL: %{SCMURL} # not possible because of forward_api_calls #BuildArch: noarch +# make sure we can invoke systemctl in post install script +%if "%{initdir}" != "%{_initrddir}" +Requires: systemd +%endif + # Uses function decorators Requires: python >= 2.7 # connecting PLC @@ -45,15 +59,6 @@ local operations on slices. nodemanager-lib only provides a skeleton and needs as a companion either nodemanager-vs or nodemanager-lxc -########## use initscripts or systemd unit files to start installed services -%if "%{distro}" == "Fedora" && %{distrorelease} >= 18 -%define make_options WITH_SYSTEMD=true -%define initdir /usr/lib/systemd/system -%else -%define make_options WITH_INIT=true -%define initdir %{_initrddir} -%endif - ############################## %prep %setup -q -- 2.43.0