diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/30-frr-configs.chroot | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/30-mpls_modules.chroot | 9 | ||||
| -rwxr-xr-x | scripts/build-GCE-image | 9 | ||||
| -rwxr-xr-x | scripts/build-packages | 1 |
5 files changed, 20 insertions, 3 deletions
diff --git a/data/defaults.json b/data/defaults.json index d730a8a6..ae2697d1 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.109", + "kernel_version": "4.19.112", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot index 105e1e06..233a7758 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -20,7 +20,7 @@ ripd=yes ripngd=yes isisd=no pimd=no -ldpd=no +ldpd=yes nhrpd=no eigrpd=no babeld=no diff --git a/data/live-build-config/hooks/live/30-mpls_modules.chroot b/data/live-build-config/hooks/live/30-mpls_modules.chroot new file mode 100755 index 00000000..79cc041a --- /dev/null +++ b/data/live-build-config/hooks/live/30-mpls_modules.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +# FRR LDP require loaded MPLS modules before starting FRR daemons + +echo I: Enabling autoload MPLS modules + +echo "mpls_gso" >> /etc/modules-load.d/mpls.conf +echo "mpls_iptunnel" >> /etc/modules-load.d/mpls.conf +echo "mpls_router" >> /etc/modules-load.d/mpls.conf diff --git a/scripts/build-GCE-image b/scripts/build-GCE-image index 9986e8dc..90eb6468 100755 --- a/scripts/build-GCE-image +++ b/scripts/build-GCE-image @@ -16,6 +16,9 @@ # Purpose: # Build VyOS image for Google cloud. +apt-get update && apt-get install -y \ + grub-pc grub2-common parted kpartx + lb bootstrap lb chroot @@ -60,6 +63,12 @@ OUTPUTGZ=VyOS-"$dateymd".tar.gz IMAGE_SIZE=10 qemu-img create -f raw ${OUTPUT} ${IMAGE_SIZE}G +LOOPNAME=`losetup -f` +LOOPMINOR=${LOOPNAME//[^0-9]} +if [ ! -e $LOOPNAME ]; then + mknod $LOOPNAME b 7 $LOOPMINOR +fi + ${PARTED} -s ${OUTPUT} mktable msdos ${PARTED} -s -a optimal ${OUTPUT} mkpart primary ext4 1Mi 100% ${PARTED} -s ${OUTPUT} set 1 boot on diff --git a/scripts/build-packages b/scripts/build-packages index 7329a845..dd812d39 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -187,7 +187,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-iproute', 'vyatta-biosdevname', 'vyos-opennhrp', - 'vyos-salt-minion', 'udp-broadcast-relay', 'vyos-1x', 'vyatta-conntrack', |