diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 | ||||
| -rw-r--r-- | packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch | 41 | ||||
| -rw-r--r-- | packages/linux-kernel/.gitignore | 1 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 4 |
5 files changed, 46 insertions, 3 deletions
diff --git a/data/defaults.json b/data/defaults.json index 3450ec69..4e137ec7 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": "5.10.7", + "kernel_version": "5.10.10", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "additional_repositories": [ diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 89e80b00..758e1c8e 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -55,6 +55,7 @@ systemctl disable hostapd.service systemctl disable keepalived.service systemctl disable ipvsadm.service systemctl disable telegraf.service +systemctl disable ndppd.service echo I: Enabling services systemctl enable ssh-session-cleanup.service diff --git a/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch b/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch new file mode 100644 index 00000000..053a5acb --- /dev/null +++ b/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch @@ -0,0 +1,41 @@ +From 258409cfa05aaa378e4f120dc67fb226465fa829 Mon Sep 17 00:00:00 2001 +From: Runar Borge <runar@borge.nu> +Date: Sat, 23 Jan 2021 00:15:41 +0100 +Subject: [PATCH] frr-reload: rpki context exiting uses exit and not end + +Issue: +The rpki subcontext uses exit instead of end to exit. +This makes issues with frr-reload in the way that frr-reload never exits +rpki context until it reaches the next end statement. this also happens when +parsing the configuration from vtysh. + +Signed-off-by: Runar Borge <runar@borge.nu> +--- + tools/frr-reload.py | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/tools/frr-reload.py b/tools/frr-reload.py +index 412cde091..33c4ef5e5 100755 +--- a/tools/frr-reload.py ++++ b/tools/frr-reload.py +@@ -452,6 +452,17 @@ end + ctx_keys = [] + current_context_lines = [] + ++ elif (line == "exit" and ++ ctx_keys[0].startswith('rpki')): ++ self.save_contexts(ctx_keys, current_context_lines) ++ log.debug('LINE %-50s: exiting old context, %-50s', line, ctx_keys) ++ ++ # Start a new context ++ new_ctx = True ++ main_ctx_key = [] ++ ctx_keys = [] ++ current_context_lines = [] ++ + elif line == "exit-vrf": + self.save_contexts(ctx_keys, current_context_lines) + current_context_lines.append(line) +-- +2.20.1 + diff --git a/packages/linux-kernel/.gitignore b/packages/linux-kernel/.gitignore index c155aeb3..84ffa9c4 100644 --- a/packages/linux-kernel/.gitignore +++ b/packages/linux-kernel/.gitignore @@ -8,6 +8,7 @@ *.deb *.changes *.buildinfo +*.tar.xz /*.postinst # Intel Driver source diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 177adf2f..5c297792 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -330,7 +330,7 @@ try: i = c.expect(['\n +Invalid command:', '\n +Set failed', 'No such file or directory', - r'\n\S+@\S+[$#]'], timeout=3600) + r'\n\S+@\S+[$#]'], timeout=7200) if i==0: raise Exception('Invalid command detected') @@ -341,7 +341,7 @@ try: raise Exception("WTF? did not find VyOS smoketest, this should be an exception") c.sendline('echo EXITCODE:$\x16?') - i = c.expect(['EXITCODE:0', 'EXITCODE:\d+'], timeout=10) + i = c.expect(['EXITCODE:0', 'EXITCODE:\d+'], timeout=20) if i==0: log.info('Smoketest finished successfully!') pass |