diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-22 08:16:47 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-27 14:45:26 +0000 |
| commit | 631a18279e5e6851b320a089137b71fc64ed3dd8 (patch) | |
| tree | 263152ccfb998302b30880111352bb852ab7343e /docker-vyos | |
| parent | 4d72f1e8a4c87c6a5a79a91b16effd6ce165745e (diff) | |
| download | vyos-build-631a18279e5e6851b320a089137b71fc64ed3dd8.tar.gz vyos-build-631a18279e5e6851b320a089137b71fc64ed3dd8.zip | |
T6507: remove references to vyos-world package
As we got rid of most of the old vyatta packages we can now also discontinue
vyos-world. It only served the purpose of keeping the package list during ISO
build small.
(cherry picked from commit 6e0f62a0ca9c2eb028eca360c0b08535a9dee778)
Diffstat (limited to 'docker-vyos')
| -rw-r--r-- | docker-vyos/vyos_install_stage_01.sh | 9 | ||||
| -rw-r--r-- | docker-vyos/vyos_install_stage_02.sh | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/docker-vyos/vyos_install_stage_01.sh b/docker-vyos/vyos_install_stage_01.sh index ce9e9b53..10f1210e 100644 --- a/docker-vyos/vyos_install_stage_01.sh +++ b/docker-vyos/vyos_install_stage_01.sh @@ -23,7 +23,14 @@ echo "Configuring APT repositories" prepare_apt # Get list of VyOS packages -vyos_packages=(`apt-cache -i depends vyos-world | awk '/Depends:/ { printf("%s ", $2) }'`) +vyos_packages=( + "vyatta-cfg-system" + "vyatta-bash" + "vyatta-op" + "vyatta-cfg" + "vyatta-wanloadbalance" + "vyos-1x" + ) # Do not analyze packages, which we do not need in Docker vyos_packages_filter=( diff --git a/docker-vyos/vyos_install_stage_02.sh b/docker-vyos/vyos_install_stage_02.sh index 81a0975b..0e3384c4 100644 --- a/docker-vyos/vyos_install_stage_02.sh +++ b/docker-vyos/vyos_install_stage_02.sh @@ -23,7 +23,14 @@ echo "Configuring APT repositories" prepare_apt # Get list of VyOS packages -vyos_packages=(`apt-cache -i depends vyos-world | awk '/Depends:/ { printf("%s ", $2) }'`) +vyos_packages=( + "vyatta-cfg-system" + "vyatta-bash" + "vyatta-op" + "vyatta-cfg" + "vyatta-wanloadbalance" + "vyos-1x" + ) # Do not analyze packages, which we do not need in Docker vyos_packages_filter=( |