diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-04-21 03:18:40 +0200 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-04-21 03:18:40 +0200 |
| commit | ae4989487412cc455bfed48a6ceab63423ba5f08 (patch) | |
| tree | 24c2dc08245f989ea600d5007a086e3483daeabb /snapcraft | |
| parent | snapcraft: Fix another old leftover of ubuntu-core in build doc (diff) | |
| download | frr-ae4989487412cc455bfed48a6ceab63423ba5f08.tar.xz frr-ae4989487412cc455bfed48a6ceab63423ba5f08.zip | |
snapcraft: Add nhrpd to snap
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'snapcraft')
| -rw-r--r-- | snapcraft/defaults/nhrpd.conf.default | 0 | ||||
| -rw-r--r-- | snapcraft/scripts/Makefile | 2 | ||||
| -rw-r--r-- | snapcraft/scripts/nhrpd-service | 12 | ||||
| -rw-r--r-- | snapcraft/snapcraft.yaml.in | 18 |
4 files changed, 29 insertions, 3 deletions
diff --git a/snapcraft/defaults/nhrpd.conf.default b/snapcraft/defaults/nhrpd.conf.default new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/snapcraft/defaults/nhrpd.conf.default diff --git a/snapcraft/scripts/Makefile b/snapcraft/scripts/Makefile index 00984c2af..0f9a24b64 100644 --- a/snapcraft/scripts/Makefile +++ b/snapcraft/scripts/Makefile @@ -11,4 +11,4 @@ install: install -D -m 0755 isisd-service $(DESTDIR)/bin/ install -D -m 0755 pimd-service $(DESTDIR)/bin/ install -D -m 0755 ldpd-service $(DESTDIR)/bin/ - + install -D -m 0755 nhrpd-service $(DESTDIR)/bin/ diff --git a/snapcraft/scripts/nhrpd-service b/snapcraft/scripts/nhrpd-service new file mode 100644 index 000000000..a3ba5e3fe --- /dev/null +++ b/snapcraft/scripts/nhrpd-service @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e -x + +if ! [ -e $SNAP_DATA/nhrpd.conf ]; then + cp $SNAP/etc/frr/nhrpd.conf.default $SNAP_DATA/nhrpd.conf +fi +exec $SNAP/sbin/nhrpd \ + -f $SNAP_DATA/nhrpd.conf \ + --pid_file $SNAP_DATA/nhrpd.pid \ + --socket $SNAP_DATA/zsock \ + --vty_socket $SNAP_DATA diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in index d0a421c62..54a1cfd4f 100644 --- a/snapcraft/snapcraft.yaml.in +++ b/snapcraft/snapcraft.yaml.in @@ -83,6 +83,13 @@ apps: - network - network-bind - network-control + nhrpd: + command: bin/nhrpd-service + daemon: simple + plugs: + - network + - network-bind + - network-control zebra-debug: command: sbin/zebra -f $SNAP_DATA/zebra.conf --pid_file $SNAP_DATA/zebra.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA plugs: @@ -132,12 +139,18 @@ apps: - network-bind - network-control ldpd-debug: - command: sbin/ldpd -f $SNAP_DATA/pimd.conf --pid_file $SNAP_DATA/pimd.pid --socket $SNAP_DATA/zsock --ctl_socket $SNAP_DATA --vty_socket $SNAP_DATA + command: sbin/ldpd -f $SNAP_DATA/ldpd.conf --pid_file $SNAP_DATA/ldpd.pid --socket $SNAP_DATA/zsock --ctl_socket $SNAP_DATA --vty_socket $SNAP_DATA plugs: - network - network-bind - network-control - + nhrpd-debug: + command: sbin/nhrpd -f $SNAP_DATA/nhrpd.conf --pid_file $SNAP_DATA/nhrpd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA + plugs: + - network + - network-bind + - network-control + parts: frr: build-packages: @@ -215,6 +228,7 @@ parts: ripd.conf.default: etc/frr/ripd.conf.default ripngd.conf.default: etc/frr/ripngd.conf.default ldpd.conf.default: etc/frr/ldpd.conf.default + nhrpd.conf.default: etc/frr/nhrpd.conf.default vtysh.conf.default: etc/frr/vtysh.conf.default frr-scripts: plugin: make |