From 0bb68611403decc9918104f7399202d44fb3d6d3 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Wed, 20 Jun 2018 14:19:11 +0200 Subject: [PATCH] redhat: stop overriding _localstatedir It is defined by rpm and points at /var Signed-off-by: Ruben Kerkhof --- redhat/frr.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index fb59f9af9e..c32680fbdf 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -38,7 +38,7 @@ %define frr_tools %{zeb_src}/tools # defines for configure -%define _localstatedir /var/run/frr +%define rundir %{_localstatedir}/run/%{name} # define for sphinx-build binary %if 0%{?rhel} && 0%{?rhel} < 7 @@ -231,7 +231,7 @@ developing OSPF-API and frr applications. %configure \ --sbindir=%{_sbindir} \ --sysconfdir=%{configdir} \ - --localstatedir=%{_localstatedir} \ + --localstatedir=%{rundir} \ --disable-werror \ --enable-irdp \ %if !%{with_shared} @@ -379,7 +379,7 @@ fi if getent passwd %frr_user >/dev/null ; then : ; else \ /usr/sbin/useradd -u %frr_uid -g %frr_gid \ -M -r -s /sbin/nologin -c "FRRouting suite" \ - -d %_localstatedir %frr_user 2> /dev/null || : ; \ + -d %{rundir} %frr_user 2> /dev/null || : ; \ fi %if 0%{?vty_group:1} /usr/sbin/usermod -a -G %vty_group %frr_user -- 2.39.5