diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2018-04-30 18:03:53 -0700 | 
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2018-04-30 18:09:03 -0700 | 
| commit | fcf7458a16e9eb4bc84ae95f1f22b5b789818e4f (patch) | |
| tree | c9f037d778d4b788008488508e4759bd152826cf /snapcraft | |
| parent | f714218ee30c1c6a0f20ab8644039a290926c0b5 (diff) | |
snapcraft: Add babel daemon to snap package
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'snapcraft')
| -rw-r--r-- | snapcraft/defaults/babeld.conf.default | 0 | ||||
| -rw-r--r-- | snapcraft/scripts/Makefile | 1 | ||||
| -rw-r--r-- | snapcraft/scripts/babeld-service | 13 | ||||
| -rw-r--r-- | snapcraft/snapcraft.yaml.in | 16 | 
4 files changed, 29 insertions, 1 deletions
diff --git a/snapcraft/defaults/babeld.conf.default b/snapcraft/defaults/babeld.conf.default new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/snapcraft/defaults/babeld.conf.default diff --git a/snapcraft/scripts/Makefile b/snapcraft/scripts/Makefile index 966623d11d..3e56aa0430 100644 --- a/snapcraft/scripts/Makefile +++ b/snapcraft/scripts/Makefile @@ -12,6 +12,7 @@ install:  	install -D -m 0755 pimd-service $(DESTDIR)/bin/  	install -D -m 0755 ldpd-service $(DESTDIR)/bin/  	install -D -m 0755 nhrpd-service $(DESTDIR)/bin/ +	install -D -m 0755 babeld-service $(DESTDIR)/bin/  	install -D -m 0755 set-options $(DESTDIR)/bin/  	install -D -m 0755 show_version $(DESTDIR)/bin/ diff --git a/snapcraft/scripts/babeld-service b/snapcraft/scripts/babeld-service new file mode 100644 index 0000000000..9e022f8569 --- /dev/null +++ b/snapcraft/scripts/babeld-service @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e -x + +if ! [ -e $SNAP_DATA/babeld.conf ]; then +    cp $SNAP/etc/frr/babeld.conf.default $SNAP_DATA/babeld.conf +fi +exec $SNAP/sbin/babeld \ +    -f $SNAP_DATA/babeld.conf \ +    --pid_file $SNAP_DATA/babeld.pid \ +    --socket $SNAP_DATA/zsock \ +    --vty_socket $SNAP_DATA + diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in index 04b4256f76..b44f95e9b1 100644 --- a/snapcraft/snapcraft.yaml.in +++ b/snapcraft/snapcraft.yaml.in @@ -4,7 +4,7 @@ summary: FRRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP routing daemon  description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM routing daemon   FRRouting (FRR) is free software which manages TCP/IP based routing    protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2,  - RIPng, PIM and LDP as well as the IPv6 versions of these. + RIPng, PIM, LDP and Babel as well as the IPv6 versions of these.   FRRouting (frr) is a fork of Quagga.  confinement: strict  grade: devel @@ -91,6 +91,13 @@ apps:              - network              - network-bind              - network-control +    babeld: +        command: bin/babeld-service +        daemon: simple +        plugs: +            - network +            - network-bind +            - network-control      set:          command: bin/set-options      zebra-debug: @@ -153,6 +160,12 @@ apps:              - network              - network-bind              - network-control +    babeld-debug: +        command: sbin/babeld -f $SNAP_DATA/babeld.conf --pid_file $SNAP_DATA/babeld.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA +        plugs: +            - network +            - network-bind +            - network-control  parts:      frr:  @@ -231,6 +244,7 @@ parts:              ripngd.conf.default: etc/frr/ripngd.conf.default              ldpd.conf.default: etc/frr/ldpd.conf.default              nhrpd.conf.default: etc/frr/nhrpd.conf.default +            babeld.conf.default: etc/frr/babeld.conf.default              vtysh.conf.default: etc/frr/vtysh.conf.default      frr-scripts:          plugin: make  | 
