diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch | 41 | ||||
| -rwxr-xr-x | scripts/make-version-file | 17 |
3 files changed, 18 insertions, 42 deletions
diff --git a/data/defaults.json b/data/defaults.json index 1d679980..93a60cf1 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.17", + "kernel_version": "5.10.19", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "additional_repositories": [ 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 deleted file mode 100644 index 053a5acb..00000000 --- a/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/scripts/make-version-file b/scripts/make-version-file index 5f394f3b..e35dfd8b 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -100,6 +100,18 @@ version_data = { 'build_comment': build_config['build_comment'] } +os_release = f""" +PRETTY_NAME="VyOS {version} ({build_config['release_train']})" +NAME="VyOS" +VERSION_ID="{version}" +VERSION="{version} ({build_config['release_train']})" +VERSION_CODENAME=buster +ID=vyos +HOME_URL="https://vyos.io" +SUPPORT_URL="https://support.vyos.io" +BUG_REPORT_URL="https://phabricator.vyos.net" +""" + os.makedirs(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/share/vyos'), exist_ok=True) with open(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/share/vyos/version.json'), 'w') as f: json.dump(version_data, f) @@ -116,3 +128,8 @@ with open(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'opt/vyatta/etc/version'), # neither we want to use lengthy paths in makefiles with open(os.path.join(defaults.BUILD_DIR, 'version'), 'w') as f: print(version, file=f) + +# Define variables that influence to welcome message on boot +os.makedirs(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/lib/'), exist_ok=True) +with open(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/lib//os-release'), 'w') as f: + print(os_release, file=f) |