redhat: stop overriding _localstatedir

It is defined by rpm and points at /var

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
This commit is contained in:
Ruben Kerkhof 2018-06-20 14:19:11 +02:00
parent e9956ac7e0
commit 0bb6861140

View File

@ -38,7 +38,7 @@
%define frr_tools %{zeb_src}/tools %define frr_tools %{zeb_src}/tools
# defines for configure # defines for configure
%define _localstatedir /var/run/frr %define rundir %{_localstatedir}/run/%{name}
# define for sphinx-build binary # define for sphinx-build binary
%if 0%{?rhel} && 0%{?rhel} < 7 %if 0%{?rhel} && 0%{?rhel} < 7
@ -231,7 +231,7 @@ developing OSPF-API and frr applications.
%configure \ %configure \
--sbindir=%{_sbindir} \ --sbindir=%{_sbindir} \
--sysconfdir=%{configdir} \ --sysconfdir=%{configdir} \
--localstatedir=%{_localstatedir} \ --localstatedir=%{rundir} \
--disable-werror \ --disable-werror \
--enable-irdp \ --enable-irdp \
%if !%{with_shared} %if !%{with_shared}
@ -379,7 +379,7 @@ fi
if getent passwd %frr_user >/dev/null ; then : ; else \ if getent passwd %frr_user >/dev/null ; then : ; else \
/usr/sbin/useradd -u %frr_uid -g %frr_gid \ /usr/sbin/useradd -u %frr_uid -g %frr_gid \
-M -r -s /sbin/nologin -c "FRRouting suite" \ -M -r -s /sbin/nologin -c "FRRouting suite" \
-d %_localstatedir %frr_user 2> /dev/null || : ; \ -d %{rundir} %frr_user 2> /dev/null || : ; \
fi fi
%if 0%{?vty_group:1} %if 0%{?vty_group:1}
/usr/sbin/usermod -a -G %vty_group %frr_user /usr/sbin/usermod -a -G %vty_group %frr_user