From: Martin Winter <mwinter@opensourcerouting.org>
Date: Thu, 7 Feb 2019 22:44:47 +0000 (-0800)
Subject: snapcraft: Update bgpd to use newer rpki lib
X-Git-Tag: frr-7.0~18^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=31cf29bcaffdd5338789f9fe3dd8bc7162395b73;p=matthieu%2Ffrr.git

snapcraft: Update bgpd to use newer rpki lib

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---

diff --git a/snapcraft/scripts/bgpd-service b/snapcraft/scripts/bgpd-service
index 6c3a6f5959..64273d9f80 100644
--- a/snapcraft/scripts/bgpd-service
+++ b/snapcraft/scripts/bgpd-service
@@ -10,7 +10,7 @@ fi
 if ! [ -e $SNAP_DATA/rpki.conf ]; then
     echo "-M rpki" > $SNAP_DATA/rpki.conf
 fi
-EXTRA_OPTIONS="`cat $SNAP_DATA/rpki.conf`"
+EXTRA_OPTIONS="`$SNAP/bin/cat $SNAP_DATA/rpki.conf`"
 exec $SNAP/sbin/bgpd \
     -f $SNAP_DATA/bgpd.conf \
     --pid_file $SNAP_DATA/bgpd.pid \
diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index 5a92f98005..a0222a86a4 100644
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -136,7 +136,7 @@ apps:
             - network-bind
             - network-control
     bgpd-debug:
-        command: sbin/bgpd -f $SNAP_DATA/bgpd.conf --pid_file $SNAP_DATA/bgpd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA --moduledir $SNAP/lib/frr/modules `cat $SNAP_DATA/rpki.conf 2> /dev/null`
+        command: sbin/bgpd -f $SNAP_DATA/bgpd.conf --pid_file $SNAP_DATA/bgpd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA --moduledir $SNAP/lib/frr/modules
         plugs:
             - network
             - network-bind
@@ -230,7 +230,7 @@ parts:
         stage-packages:
            - libssh-4
         prime:
-           - lib/x86_64-linux-gnu/librtr.so*
+           - lib/librtr.so*
            - usr/lib/x86_64-linux-gnu/libssh.so*
         source: https://github.com/rtrlib/rtrlib.git
         source-type: git