Sync frr-doc.doc-base, d/frr.conf and d/frr.install with debian/master branch

diff --git a/debian/frr-doc.doc-base b/debian/frr-doc.doc-base
index 189490785222217dc900881c8a0746fd7d76e8cf..ec7870d7aaf16a63e9a678133ed980d0f2f685c9 100644 (file)
--- a/debian/frr-doc.doc-base
+++ b/debian/frr-doc.doc-base
@@ -12,3 +12,12 @@ Format: info
 Index: /usr/share/info/frr.info.gz
 Files:
  /usr/share/info/frr.info.gz
+ /usr/share/info/fig-normal-processing.png
+ /usr/share/info/fig-rs-processing.png
+ /usr/share/info/fig-vnc-commercial-route-reflector.png
+ /usr/share/info/fig-vnc-frr-route-reflector.png
+ /usr/share/info/fig-vnc-gw.png
+ /usr/share/info/fig-vnc-mesh.png
+ /usr/share/info/fig-vnc-redundant-route-reflectors.png
+ /usr/share/info/fig_topologies_full.png
+ /usr/share/info/fig_topologies_rs.png

diff --git a/debian/frr.conf b/debian/frr.conf
new file mode 100644 (file)
index 0000000..dee3cd8
--- /dev/null
+++ b/debian/frr.conf
@@ -0,0 +1,2 @@
+# Create the /run/frr directory at boot or from systemd-tmpfiles on install
+d /run/frr 0755 frr frr

diff --git a/debian/frr.install b/debian/frr.install
index 38ddd1b9be657836cefae730c8880e4086068369..cefc3135b2e5d1f82c30a381b90f24f59fc3c779 100644 (file)
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -1,3 +1,4 @@
+debian/frr.conf usr/lib/tmpfiles.d
 etc/
 tools/frr-reload usr/lib/frr/
 usr/bin/mtracebis