forked from pool/conman
Accepting request 532666 from network:cluster
- Set usr/group for conman to root/root on SLE12 for backward compatibility. (forwarded request 532653 from eeich) OBS-URL: https://build.opensuse.org/request/show/532666 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conman?expand=0&rev=5
This commit is contained in:
commit
64c12453bb
@ -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
|
Fri Oct 6 13:59:27 UTC 2017 - eich@suse.com
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ After=network.target
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
User=conman
|
User=@conman_u@
|
||||||
Group=conman
|
Group=@conman_g@
|
||||||
ExecStart=/usr/sbin/conmand -c /etc/conman.conf
|
ExecStart=/usr/sbin/conmand -c /etc/conman.conf
|
||||||
|
|
||||||
[Install]
|
[Install]
|
15
conman.spec
15
conman.spec
@ -25,8 +25,13 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?have_systemd}
|
%if 0%{?have_systemd}
|
||||||
%define conman_g %name
|
%if 0%{?sle_version} >= 150000 || 0%{?is_opensuse}
|
||||||
%define conman_u %name
|
%define conman_g %name
|
||||||
|
%define conman_u %name
|
||||||
|
%else
|
||||||
|
%define conman_g root
|
||||||
|
%define conman_u root
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
%define conman_g root
|
%define conman_g root
|
||||||
%define conman_u daemon
|
%define conman_u daemon
|
||||||
@ -49,7 +54,7 @@ BuildRequires: tcpd-devel
|
|||||||
BuildRequires: freeipmi-devel
|
BuildRequires: freeipmi-devel
|
||||||
%endif
|
%endif
|
||||||
Source0: https://github.com/dun/conman/archive/%{name}-%{version}.tar.gz
|
Source0: https://github.com/dun/conman/archive/%{name}-%{version}.tar.gz
|
||||||
Source1: %{name}.service
|
Source1: %{name}.service.in
|
||||||
%if 0%{?have_systemd}
|
%if 0%{?have_systemd}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
@ -95,7 +100,9 @@ make %{?_smp_mflags}
|
|||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
%if 0%{?have_systemd}
|
%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
|
rm -rf %{buildroot}%{_sysconfdir}/init.d
|
||||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcconman
|
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcconman
|
||||||
%else
|
%else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user