From c1018b4538582b6b3fca69e41a0594715c0cc513 Mon Sep 17 00:00:00 2001
From: Martin Winter <mwinter@opensourcerouting.org>
Date: Sat, 9 Nov 2019 16:27:04 +0100
Subject: [PATCH] snapcraft: Add vrrpd to the snapcraft package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---
 snapcraft/defaults/vrrpd.conf.default |  0
 snapcraft/scripts/Makefile            |  1 +
 snapcraft/scripts/vrrpd-service       | 13 +++++++++++++
 snapcraft/snapcraft.yaml.in           | 16 +++++++++++++++-
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 snapcraft/defaults/vrrpd.conf.default
 create mode 100644 snapcraft/scripts/vrrpd-service

diff --git a/snapcraft/defaults/vrrpd.conf.default b/snapcraft/defaults/vrrpd.conf.default
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/snapcraft/scripts/Makefile b/snapcraft/scripts/Makefile
index 7ddb7f0769..0435b3bc52 100644
--- a/snapcraft/scripts/Makefile
+++ b/snapcraft/scripts/Makefile
@@ -18,6 +18,7 @@ install:
 	install -D -m 0755 staticd-service $(DESTDIR)/bin/
 	install -D -m 0755 bfdd-service $(DESTDIR)/bin/
 	install -D -m 0755 fabricd-service $(DESTDIR)/bin/
+	install -D -m 0755 vrrpd-service $(DESTDIR)/bin/
 	install -D -m 0755 set-options $(DESTDIR)/bin/
 	install -D -m 0755 show_version $(DESTDIR)/bin/
 
diff --git a/snapcraft/scripts/vrrpd-service b/snapcraft/scripts/vrrpd-service
new file mode 100644
index 0000000000..1f60d11469
--- /dev/null
+++ b/snapcraft/scripts/vrrpd-service
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e -x
+
+if ! [ -e $SNAP_DATA/vrrpd.conf ]; then
+    cp $SNAP/etc/frr/vrrpd.conf.default $SNAP_DATA/vrrpd.conf
+fi
+exec $SNAP/sbin/vrrpd \
+    -f $SNAP_DATA/vrrpd.conf \
+    --pid_file $SNAP_DATA/vrrpd.pid \
+    --socket $SNAP_DATA/zsock \
+    --vty_socket $SNAP_DATA
+
diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index d8071e8cfe..b06e841f74 100644
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -134,6 +134,13 @@ apps:
             - network
             - network-bind
             - network-control
+    vrrpd:
+        command: bin/vrrpd-service
+        daemon: simple
+        plugs:
+            - network
+            - network-bind
+            - network-control
     set:
         command: bin/set-options
     zebra-debug:
@@ -232,7 +239,12 @@ apps:
             - network
             - network-bind
             - network-control
-
+    vrrpd-debug:
+        command: sbin/vrrpd -f $SNAP_DATA/vrrpd.conf --pid_file $SNAP_DATA/vrrpd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA
+        plugs:
+            - network
+            - network-bind
+            - network-control
 parts:
     rtrlib:
         build-packages:
@@ -327,6 +339,7 @@ parts:
             - --enable-fpm
             - --enable-protobuf
             - --enable-rpki
+            - --enable-vrrpd
             - --enable-configfile-mask=0640
             - --enable-logfile-mask=0640 
             - --localstatedir=/var/run
@@ -353,6 +366,7 @@ parts:
             pbrd.conf.default: etc/frr/pbrd.conf.default
             bfdd.conf.default: etc/frr/bfdd.conf.default
             fabricd.conf.default: etc/frr/fabricd.conf.default
+            vrrpd.conf.default: etc/frr/vrrpd.conf.default
             vtysh.conf.default: etc/frr/vtysh.conf.default
             staticd.conf.default: etc/frr/staticd.conf.default
     frr-scripts:
-- 
2.39.5