neil/lxc-templates
1
0
Fork 1
mirror of https://github.com/lxc/lxc-templates.git synced 2026-09-19 06:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36 from TanyaEleventhGoddess/master

Browse Source 
Changed devuan gpg key remote location
This commit is contained in:
Christian Brauner
2020-09-06 22:24:11 +02:00
committed by GitHub
parent 0aab971c60 8af77c1136
commit 32bc638e5e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/lxc-debian.in
+1 -1
View File
@@ -42,7 +42,7 @@ LOCALSTATEDIR="@LOCALSTATEDIR@"
LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@" LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
# Allows the lxc-cache directory to be set by environment variable # Allows the lxc-cache directory to be set by environment variable
LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"} LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"}
[ -z "$DOWNLOAD_KEYRING" ] && DOWNLOAD_KEYRING=1 DOWNLOAD_KEYRING=${DOWNLOAD_KEYRING:-1}
find_interpreter() find_interpreter()
{ {
templates/lxc-devuan.in
+2 -2
View File
@@ -42,7 +42,7 @@ LOCALSTATEDIR="@LOCALSTATEDIR@"
LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@" LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
# Allows the lxc-cache directory to be set by environment variable # Allows the lxc-cache directory to be set by environment variable
LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"} LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"}
[ -z "$DOWNLOAD_KEYRING" ] && DOWNLOAD_KEYRING=1 DOWNLOAD_KEYRING=${DOWNLOAD_KEYRING:-1}
find_interpreter() find_interpreter()
{ {
@@ -350,7 +350,7 @@ apt-transport-https
elif [ "$DOWNLOAD_KEYRING" = 1 ]; then elif [ "$DOWNLOAD_KEYRING" = 1 ]; then
[ ! -d "/etc/apt/trusted.gpg.d" ] && lreleasekeyring="$cache/archive-key.gpg" [ ! -d "/etc/apt/trusted.gpg.d" ] && lreleasekeyring="$cache/archive-key.gpg"
if [[ "$(id -u)" == "0" ]]; then if [[ "$(id -u)" == "0" ]]; then
wget https://git.devuan.org/devuan/devuan-keyring/raw/branch/master/keyrings/devuan-archive-keyring.gpg -O - --quiet \ wget https://files.devuan.org/devuan-archive-keyring.gpg -O - --quiet \
| gpg --import --no-default-keyring --keyring="${lreleasekeyring}" | gpg --import --no-default-keyring --keyring="${lreleasekeyring}"
apt_gpg_opt="--keyring=${lreleasekeyring}" apt_gpg_opt="--keyring=${lreleasekeyring}"
else else
templates/lxc-kali.in
+1 -1
View File
@@ -43,7 +43,7 @@ LOCALSTATEDIR="@LOCALSTATEDIR@"
LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@" LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
# Allows the lxc-cache directory to be set by environment variable # Allows the lxc-cache directory to be set by environment variable
LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"} LXC_CACHE_PATH=${LXC_CACHE_PATH:-"$LOCALSTATEDIR/cache/lxc"}
[ -z "$DOWNLOAD_KEYRING" ] && DOWNLOAD_KEYRING=1 DOWNLOAD_KEYRING=${DOWNLOAD_KEYRING:-1}
find_interpreter() find_interpreter()
{ {