From 05bed25180e0817f9416ca11609a0a7e0ea066c50cd3695b36d4be2dcef3e09f Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 9 Oct 2017 07:17:36 +0000 Subject: [PATCH] Accepting request 532653 from home:eeich:branches:network:cluster - Set usr/group for conman to root/root on SLE12 for backward compatibility. OBS-URL: https://build.opensuse.org/request/show/532653 OBS-URL: https://build.opensuse.org/package/show/network:cluster/conman?expand=0&rev=15 --- conman.changes | 6 ++++++ conman.service => conman.service.in | 4 ++-- conman.spec | 15 +++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) rename conman.service => conman.service.in (84%) diff --git a/conman.changes b/conman.changes index 7c9cf89..b21fd12 100644 --- a/conman.changes +++ b/conman.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 9 06:39:12 UTC 2017 - eich@suse.com + +- Set usr/group for conman to root/root on SLE12 for backward + compatibility. + ------------------------------------------------------------------- Fri Oct 6 13:59:27 UTC 2017 - eich@suse.com diff --git a/conman.service b/conman.service.in similarity index 84% rename from conman.service rename to conman.service.in index e83b192..04635e3 100644 --- a/conman.service +++ b/conman.service.in @@ -4,8 +4,8 @@ After=network.target [Service] Type=forking -User=conman -Group=conman +User=@conman_u@ +Group=@conman_g@ ExecStart=/usr/sbin/conmand -c /etc/conman.conf [Install] diff --git a/conman.spec b/conman.spec index 84ed4da..d954e0b 100644 --- a/conman.spec +++ b/conman.spec @@ -25,8 +25,13 @@ %endif %if 0%{?have_systemd} - %define conman_g %name - %define conman_u %name + %if 0%{?sle_version} >= 150000 || 0%{?is_opensuse} + %define conman_g %name + %define conman_u %name + %else + %define conman_g root + %define conman_u root + %endif %else %define conman_g root %define conman_u daemon @@ -49,7 +54,7 @@ BuildRequires: tcpd-devel BuildRequires: freeipmi-devel %endif Source0: https://github.com/dun/conman/archive/%{name}-%{version}.tar.gz -Source1: %{name}.service +Source1: %{name}.service.in %if 0%{?have_systemd} BuildRequires: systemd BuildRequires: systemd-rpm-macros @@ -95,7 +100,9 @@ make %{?_smp_mflags} %make_install %if 0%{?have_systemd} -install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service +mkdir -p %{buildroot}%{_unitdir} +sed -e "s/@conman_u@/%conman_u/" -e "s/@conman_g@/%conman_g/" <%{SOURCE1} >%{buildroot}%{_unitdir}/%{name}.service +chmod 0644 %{buildroot}%{_unitdir}/%{name}.service rm -rf %{buildroot}%{_sysconfdir}/init.d ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcconman %else