diff options
| author | zsdc <taras@vyos.io> | 2021-03-18 17:51:00 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2021-03-18 17:51:00 +0200 |
| commit | c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f (patch) | |
| tree | 577c07b3d85f531ce6704e367c4a29f6e9a2427e /templates | |
| parent | c084415cff751d488d1460e58203ade538aea754 (diff) | |
| download | vyos-vm-images-c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f.tar.gz vyos-vm-images-c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f.zip | |
Multiple build improvements
- Removed `empty_config` option. The config should be now always empty because Cloud-init adds required parts dynamically at the first boot.
- Added ability to include any additional packages to the image, from list or deb files.
- Moved common resources for multiple tasks from tasks folder to `files` and `templates` on the root folder.
- Make `trim` actually works. Before this, it actually was a no-op, because RAW image mounted without the `discard` option cannot be trimmed. This significantly reduced the size of images with any additional packages inside, for example with Cloud-init.
- Fixed APT repository paths, according to the new structure of `dev.packages.vyos.net`.
- Added proper build repository for VyOS 1.3. It used the wrong `current` repo when should be `equuleus` now.
- Removed unused `boot/grub/device.map.j2` template.
- Deleted a secondary console option from the `grub.cfg.j2` template. According to testing an active console is only the latest listed, so it seems that there is no sense to keep there two items.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/debian.list.j2 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/templates/debian.list.j2 b/templates/debian.list.j2 new file mode 100644 index 0000000..7d7c3f3 --- /dev/null +++ b/templates/debian.list.j2 @@ -0,0 +1,17 @@ +{% if vyos_version | regex_search('(^1\.2)') %} +deb http://deb.debian.org/debian jessie main contrib non-free +deb http://deb.debian.org/debian jessie-updates main contrib non-free +deb http://security.debian.org/debian-security/ jessie/updates main contrib non-free +deb http://dev.packages.vyos.net/repositories/crux/vyos crux main +deb http://dev.packages.vyos.net/repositories/crux/debian crux main +{% elif vyos_version | regex_search('(^1\.3)') %} +deb http://deb.debian.org/debian buster main contrib non-free +deb http://deb.debian.org/debian buster-updates main contrib non-free +deb http://security.debian.org/debian-security/ buster/updates main contrib non-free +deb http://dev.packages.vyos.net/repositories/{{ debian_version.stdout }} {{ debian_version.stdout }} main +{% else %} +deb http://deb.debian.org/debian buster main contrib non-free +deb http://deb.debian.org/debian buster-updates main contrib non-free +deb http://security.debian.org/debian-security/ buster/updates main contrib non-free +deb http://dev.packages.vyos.net/repositories/current current main +{% endif %}
\ No newline at end of file |