From 7e785e989dfdf304150cc4fc0fe7d86f2a956341 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 31 Dec 2018 20:04:29 +0100 Subject: T1043: fail commit when multicast VXLAN is configured without the link option. --- templates/interfaces/vxlan/node.def | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/interfaces/vxlan/node.def b/templates/interfaces/vxlan/node.def index e8b625e1..70deef60 100644 --- a/templates/interfaces/vxlan/node.def +++ b/templates/interfaces/vxlan/node.def @@ -29,6 +29,10 @@ create: if [ ! $VAR(./group/) == "" ]; then VXLAN_GROUP="group $VAR(./group/@)" + if [ -z "$VXLAN_DEV" ]; then + echo "For multicast VXLAN, link (network interface) must be configured" + exit 1 + fi fi if [ ! $VAR(./remote/) == "" ]; then -- cgit v1.2.3 From 8a062ec84e9ec4a33a54a8dac020d05407ac1650 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 2 Jan 2019 10:43:59 +0100 Subject: T1146: do not modify the rc.local script, postconfig scripts are now run from vyos-router. --- debian/vyatta-cfg-system.postinst.in | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index be10fda4..896eb6c6 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -135,25 +135,6 @@ if [ ! -x /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script ]; then EOF fi -# call vyatta-postconfig-bootup.script from /etc/rc.local -if ! grep -q /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script \ - /etc/rc.local -then - cat <>/etc/rc.local -# Do not remove the following call to vyatta-postconfig-bootup.script. -# Any boot time workarounds should be put in script below so that they -# get preserved for the new image during image upgrade. -POSTCONFIG_OLD=/opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script -POSTCONFIG_NEW=/config/scripts/vyos-postconfig-bootup.script -[ -x \$POSTCONFIG_OLD ] && \$POSTCONFIG_OLD -[ -x \$POSTCONFIG_NEW ] && \$POSTCONFIG_NEW -EOF - sh -c "sed -i -e '/exit 0/d' /etc/rc.local" - cat <>/etc/rc.local -exit 0 -EOF -fi - touch /etc/environment if [ ! -f /etc/bash_completion ]; then -- cgit v1.2.3 From df96aa9b43aa7097a337a3e65f83fe7fdc9028ef Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 2 Jan 2019 11:37:44 +0100 Subject: T728: use vyos-postconfig-bootup.script name by default for new installations. --- debian/vyatta-cfg-system.postinst.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 896eb6c6..965563c8 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -121,17 +121,17 @@ chmod -R 775 /opt/vyatta/etc/config mkdir -p /opt/vyatta/etc/logrotate mkdir -p /opt/vyatta/etc/netdevice.d -# create /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script +# create /opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script # this should be after 'mkdir -p /opt/vyatta/etc/config/scripts' above -if [ ! -x /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script ]; then - touch /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script - chmod 755 /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script - cat <>/opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script +if [ ! -x /opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script ]; then + touch /opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script + chmod 755 /opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script + cat <>/opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script #!/bin/sh -# This script is called from /etc/rc.local on boot after the Vyatta -# configuration is fully applied. Any modifications done to work around -# unfixed bugs and implement enhancements which are not complete in the Vyatta -# system can be placed here. +# This script is executed at boot time after VyOS configuration is fully applied. +# Any modifications required to work around unfixed bugs +# or use services not available through the VyOS CLI system can be placed here. + EOF fi -- cgit v1.2.3