Skip to content

Commit

Permalink
packaging: Specify /run as a runstatedir
Browse files Browse the repository at this point in the history
/var/run is _deprecated_ (= legacy), let's use just /run.

/usr/lib/systemd/system/frr.service:20: PIDFile= references a path below legacy directory /var/run/, updating /var/run/frr/watchfrr.pid → /run/frr/watchfrr.pid; please update the unit file accordingly.

Signed-off-by: Donatas Abraitis <[email protected]>
  • Loading branch information
ton31337 committed Nov 26, 2024
1 parent d405725 commit c3ee937
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export PYTHON=python3
override_dh_auto_configure:
$(shell dpkg-buildflags --export=sh); \
dh_auto_configure -- \
--runstatedir=/run \
--sbindir=/usr/lib/frr \
--with-vtysh-pager=/usr/bin/pager \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr \
Expand Down
3 changes: 2 additions & 1 deletion redhat/frr.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
%define frr_tools %{zeb_src}/tools

%if 0%{!?_runstatedir:1}
%define _runstatedir %{_localstatedir}/run
%define _runstatedir /run
%endif

############################################################################
Expand Down Expand Up @@ -337,6 +337,7 @@ Adds GRPC support to the individual FRR daemons.
#CFLAGS="${CFLAGS} -Wpacked -Wpadded"

%configure \
--runstatedir=/run \
--sbindir=%{_sbindir} \
--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_localstatedir} \
Expand Down

0 comments on commit c3ee937

Please sign in to comment.