2004-01-08 Paul Jakma <paul@dishone.st>
* Makefile.am: as per gdt, specify the redhat dir as a DIST_SUBDIR,
remove the redhat/... dist targets - instead these now go in..
redhat/Makefile.am: (new) proper place to describe redhat/ dist
files, as well as allow quagga.spec to be regenerated properly.
redhat/quagga.sysconfig: specify conf file location.
redhat/quagga.spec.in: Add 2 patches to RPM build.
diff --git a/redhat/quagga.sysconfig b/redhat/quagga.sysconfig
index fc905af..2194d6a 100644
--- a/redhat/quagga.sysconfig
+++ b/redhat/quagga.sysconfig
@@ -1,9 +1,11 @@
#
# Default: Bind all daemon vtys to the loopback(s) only
#
-BGPD_OPTS="-A 127.0.0.1"
-OSPF6D_OPTS="-A ::1"
-OSPFD_OPTS="-A 127.0.0.1"
-RIPD_OPTS="-A 127.0.0.1"
-RIPNGD_OPTS="-A ::1"
-ZEBRA_OPTS="-A 127.0.0.1"
+QCONFDIR="/etc/quagga"
+BGPD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/bgpd.conf"
+OSPF6D_OPTS="-A ::1$ -f ${QCONFDIR}/ospf6d.conf"
+OSPFD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/ospfd.conf"
+RIPD_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/ripd.conf"
+RIPNGD_OPTS="-A ::1 -f ${QCONFDIR}/ripngd.conf"
+ZEBRA_OPTS="-A 127.0.0.1 -f ${QCONFDIR}/zebra.conf"
+ISISD_OPTS="-A ::1 -f ${QCONFDIR}/isisd.conf"