mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-02 02:19:36 +00:00
Code Issues Releases Wiki Activity

lxc-download.in / allow setting keyserver from env

Browse Source 
Checks if DOWNLOAD_KEYSERVER has already been set in the environment before setting a value

Signed-off-by: Tai Kedzierski <dch.tai@gmail.com>
This commit is contained in:
Tai Kedzierski
2017-03-19 09:21:29 +00:00
parent b49bb7dce8
commit a6a7c7d191
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/lxc-download.in
View File

@@ -34,7 +34,6 @@ DOWNLOAD_FLUSH_CACHE="false"
DOWNLOAD_FORCE_CACHE="false" DOWNLOAD_FORCE_CACHE="false"
DOWNLOAD_INTERACTIVE="false" DOWNLOAD_INTERACTIVE="false"
DOWNLOAD_KEYID="0xE7FB0CAEC8173D669066514CBAEFF88C22F6E216" DOWNLOAD_KEYID="0xE7FB0CAEC8173D669066514CBAEFF88C22F6E216"
DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net"
DOWNLOAD_LIST_IMAGES="false" DOWNLOAD_LIST_IMAGES="false"
DOWNLOAD_MODE="system" DOWNLOAD_MODE="system"
DOWNLOAD_READY_GPG="false" DOWNLOAD_READY_GPG="false"
@@ -54,9 +53,13 @@ LXC_NAME=
LXC_PATH= LXC_PATH=
LXC_ROOTFS= LXC_ROOTFS=
# Deal with GPG over http proxy if [ -z "${DOWNLOAD_KEYSERVER+x}" ]; then
if [ -n "${http_proxy:-}" ]; then DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net"
DOWNLOAD_KEYSERVER="hkp://p80.pool.sks-keyservers.net:80"
# Deal with GPG over http proxy
if [ -n "${http_proxy:-}" ]; then
DOWNLOAD_KEYSERVER="hkp://p80.pool.sks-keyservers.net:80"
fi
fi fi
# Make sure the usual locations are in PATH # Make sure the usual locations are in PATH