Commit 420f5869 authored by Robert James Hernandez's avatar Robert James Hernandez
Browse files

frr: localstatedir=/var so frr_libstatedir is properly set

When localstatedir=/run/frr it results in frr_libstatedir=/lib/frr. This is
due to truncating of localstatedir given the following case:

  https://github.com/FRRouting/frr/blob/ce66553bafc1806d745ea0724caca362d7335851/configure.ac#L59

And then localstatedir="" is later used to set
frr_libstatedir="\${localstatedir}/lib/frr":
  https://github.com/FRRouting/frr/blob/ce66553bafc1806d745ea0724caca362d7335851/configure.ac#L94

Setting localstatedir=/var (the recommended value) from the warning:

  https://github.com/FRRouting/frr/blob/ce66553bafc1806d745ea0724caca362d7335851/configure.ac#L61

This correctly set frr_libstatedir to /var/lib/frr and fixes the errors
during frr startup.
parent c8cb9562
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
    "--enable-multipath=${toString numMultipath}"
    "--enable-user=frr"
    "--enable-vty-group=frrvty"
    "--localstatedir=/run/frr"
    "--localstatedir=/var"
    "--sbindir=${placeholder "out"}/libexec/frr"
    "--sysconfdir=/etc/frr"
    "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"