diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:58:16 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:58:16 +0100 |
| commit | ea136142d467cf76b2e3d9d33a3ca1c93ae9d169 (patch) | |
| tree | 5c7baf7bfc93393730aec1e7749daf8506cc512c /scripts | |
| parent | c3cbc7af476fb78d29e7cc9845749032a978c14f (diff) | |
| parent | e598fd03b6a2fdd5a1b73966b7141d4fa40fb962 (diff) | |
| download | vyos-build-ea136142d467cf76b2e3d9d33a3ca1c93ae9d169.tar.gz vyos-build-ea136142d467cf76b2e3d9d33a3ca1c93ae9d169.zip | |
Merge branch 'current' into equuleus
* current:
wireless: T1627: migrate to vyos-1x
T1804: add python3-psutil to docker image
Kernel: T1800: update to Linux 4.19.84
add api option to the ovf template
hooks: fix installation of linux firmware files
Kernel: T1791: update to Linux 4.19.82
Revert "docker: set always pull to use always latest container"
docker: set always pull to use always latest container
vyos-qat: adding pkg dependency
Revert "Docker: always use libvyosconfig HEAD revision"
do not add the serial option for vep4600
add build option for vep4600
Docker: always use libvyosconfig HEAD revision
T1773: update Dockerfile for changes to libvyosconfig
Firmware: bail out when there is a download error
Kernel: T1728: update to Linux 4.19.79
T1726: update Linux Firmware to a more recent version (2019-10-07)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-packages | 1 | ||||
| -rw-r--r-- | scripts/template.ovf | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build-packages b/scripts/build-packages index 8d1447dd..0d81ef91 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -166,7 +166,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-webproxy', 'vyatta-cfg-quagga', 'vyatta-op-quagga', - 'vyatta-wireless', 'vyatta-wirelessmodem', 'vyatta-wanloadbalance', 'vyatta-netflow', diff --git a/scripts/template.ovf b/scripts/template.ovf index 88ea5562..b0952c8c 100644 --- a/scripts/template.ovf +++ b/scripts/template.ovf @@ -78,6 +78,10 @@ <Label>Domain Time Servers</Label> <Description>NTP servers for this VM (comma separated). Leave blank if DHCP is desired.</Description> </Property> + <Property ovf:key="APIKEY" ovf:type="string" ovf:userConfigurable="true"> + <Label>HTTP API configuration key</Label> + <Description>API configuration key. Leave blank to not enable the API.</Description> + </Property> </ProductSection> <ProductSection ovf:class="vm" ovf:required="false"> <Info>VM specific properties</Info> |