frr: clean up config warnings
- sysconfdir should not have /frr at the end - --disable-exampledir, --enable-rtadv, & --enable-rr-semantics are unsupported
This commit is contained in:
@@ -43,9 +43,7 @@
|
|||||||
numMultipath ? 64,
|
numMultipath ? 64,
|
||||||
watchfrrSupport ? true,
|
watchfrrSupport ? true,
|
||||||
cumulusSupport ? false,
|
cumulusSupport ? false,
|
||||||
rtadvSupport ? true,
|
|
||||||
irdpSupport ? true,
|
irdpSupport ? true,
|
||||||
routeReplacementSupport ? true,
|
|
||||||
mgmtdSupport ? true,
|
mgmtdSupport ? true,
|
||||||
# Experimental as of 10.1, reconsider if upstream changes defaults
|
# Experimental as of 10.1, reconsider if upstream changes defaults
|
||||||
grpcSupport ? false,
|
grpcSupport ? false,
|
||||||
@@ -151,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-silent-rules"
|
"--disable-silent-rules"
|
||||||
"--disable-exampledir"
|
|
||||||
"--enable-configfile-mask=0640"
|
"--enable-configfile-mask=0640"
|
||||||
"--enable-group=frr"
|
"--enable-group=frr"
|
||||||
"--enable-logfile-mask=0640"
|
"--enable-logfile-mask=0640"
|
||||||
@@ -160,15 +157,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"--enable-vty-group=frrvty"
|
"--enable-vty-group=frrvty"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
"--sbindir=${placeholder "out"}/libexec/frr"
|
"--sbindir=${placeholder "out"}/libexec/frr"
|
||||||
"--sysconfdir=/etc/frr"
|
"--sysconfdir=/etc"
|
||||||
"--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
|
"--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
|
||||||
# general options
|
# general options
|
||||||
(lib.strings.enableFeature snmpSupport "snmp")
|
(lib.strings.enableFeature snmpSupport "snmp")
|
||||||
(lib.strings.enableFeature rpkiSupport "rpki")
|
(lib.strings.enableFeature rpkiSupport "rpki")
|
||||||
(lib.strings.enableFeature watchfrrSupport "watchfrr")
|
(lib.strings.enableFeature watchfrrSupport "watchfrr")
|
||||||
(lib.strings.enableFeature rtadvSupport "rtadv")
|
|
||||||
(lib.strings.enableFeature irdpSupport "irdp")
|
(lib.strings.enableFeature irdpSupport "irdp")
|
||||||
(lib.strings.enableFeature routeReplacementSupport "rr-semantics")
|
|
||||||
(lib.strings.enableFeature mgmtdSupport "mgmtd")
|
(lib.strings.enableFeature mgmtdSupport "mgmtd")
|
||||||
(lib.strings.enableFeature grpcSupport "grpc")
|
(lib.strings.enableFeature grpcSupport "grpc")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user