diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-10-30 19:41:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-30 19:41:53 +0100 |
| commit | 64e77f12f66ce4031cf858fc1455e275b106d56e (patch) | |
| tree | 88b2360b19787e83aa167430c55eea988251f682 | |
| parent | 25a60f3d91307eefa02ee3fabbe675f4c4cb4bd4 (diff) | |
| parent | f39f4d1f23c5b54273ba483a7c8bf43fd1d521ec (diff) | |
| download | vyos-build-64e77f12f66ce4031cf858fc1455e275b106d56e.tar.gz vyos-build-64e77f12f66ce4031cf858fc1455e275b106d56e.zip | |
Merge pull request #271 from dmbaturin/os-release-dehardcoding
T3664: dehardcode fields of the OS release file
| -rw-r--r-- | data/defaults.toml | 4 | ||||
| -rwxr-xr-x | scripts/build-vyos-image | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 94ffb4a3..28db3067 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -18,3 +18,7 @@ additional_repositories = [ "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main", "deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-48 main" ] + +website_url = "https://vyos.io" +support_url = "https://support.vyos.io" +bugtracker_url = "https://phabricator.vyos.net" diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 5d0248a0..1406aec9 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -328,11 +328,11 @@ if __name__ == "__main__": NAME="VyOS" VERSION_ID="{version}" VERSION="{version} ({build_config['release_train']})" - VERSION_CODENAME=buster + VERSION_CODENAME={build_defaults['debian_distribution']} ID=vyos - HOME_URL="https://vyos.io" - SUPPORT_URL="https://support.vyos.io" - BUG_REPORT_URL="https://phabricator.vyos.net" + HOME_URL="{build_defaults['website_url']}" + SUPPORT_URL="{build_defaults['support_url']}" + BUG_REPORT_URL="{build_defaults['bugtracker_url']}" """ chroot_includes_dir = os.path.join(defaults.BUILD_DIR, defaults.CHROOT_INCLUDES_DIR) |