summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/vyatta-cfg-system.postinst.in35
-rwxr-xr-xscripts/vyatta-grub-setup6
-rwxr-xr-xscripts/vyatta-tunnel-cleanup10
-rw-r--r--templates/interfaces/vxlan/node.def4
5 files changed, 22 insertions, 40 deletions
diff --git a/debian/changelog b/debian/changelog
index 1f14c36e..bfe81527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+vyatta-cfg-system (0.20.44+vyos2+current17) unstable; urgency=low
+
+ * T1026 - Removing tunnel deletes all tunnels?
+
+ -- hagbard <vyosdev@derith.de> Mon, 07 Jan 2019 14:24:33 -0800
+
vyatta-cfg-system (0.20.44+vyos2+current16) unstable; urgency=low
* T1053 - Error when re-configuring an interface from DHCP to static IP
-- hagbard <vyosdev@derith.de> Thu, 29 Nov 2018 14:26:07 -0800
+
vyatta-cfg-system (0.20.44+vyos2+current15) unstable; urgency=medium
* Virtio network card, no info (maybe not fully supported?)
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index be10fda4..965563c8 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -121,36 +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 <<EOF >>/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 <<EOF >>/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.
-EOF
-fi
+# 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.
-# 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 <<EOF >>/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 <<EOF >>/etc/rc.local
-exit 0
EOF
fi
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index d769c1f6..8f0734ed 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -60,9 +60,9 @@ ROOTFSDIR="$3"
# Grub options
if [ "$GRUB_OPTIONS" ]
then
- GRUB_OPTIONS="$GRUB_OPTIONS quiet"
+ GRUB_OPTIONS="$GRUB_OPTIONS quiet rootdelay=5"
else
- GRUB_OPTIONS=quiet
+ GRUB_OPTIONS="quiet rootdelay=5"
fi
# Path to standalone root password reset script
@@ -103,7 +103,7 @@ else
fi
if eval "$UNION"; then
- GRUB_OPTIONS="boot=live quiet vyos-union=/boot/$livedir"
+ GRUB_OPTIONS="boot=live quiet rootdelay=5 vyos-union=/boot/$livedir"
union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \
2>/dev/null \
| awk -F/ '{ print $6 }' \
diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup
index 979fb7bd..b8a93244 100755
--- a/scripts/vyatta-tunnel-cleanup
+++ b/scripts/vyatta-tunnel-cleanup
@@ -28,13 +28,3 @@ foreach my $tun ( $config->listEffectiveNodes() ) {
next if ($interface eq $tun); # don't count the one being deleted
$tunnel{$mode} = 1;
}
-
-foreach my $type ( keys %encapsulation ) {
- # skip if tunnel is still in use
- next if $tunnel{$type};
-
- my $module = $encapsulation{$type};
- next unless ( -d "/sys/module/$module" );
- system("sudo /sbin/rmmod $module") == 0
- or warn "rmmod $module failed\n";
-}
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