Skip to content

L
lxc
Commit fad96766 by Dwight Engen Committed by Stéphane Graber
Options

download: don't download signatures when --no-validate given

- show full path to failed download location - change test to -f in case meta.tar.xz:templates has a blank line it won't attempt to sed a directory Signed-off-by: 's avatarDwight Engen <dwight.engen@oracle.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent cb131151
Showing with 14 additions and 6 deletions
templates/lxc-download.in
...@@ -60,7 +60,7 @@ download_file() { ...@@ -60,7 +60,7 @@ download_file() {
if [ "$3" = "noexit" ]; then if [ "$3" = "noexit" ]; then
return 1 return 1
else else
echo "ERROR: Failed to download $1" 1>&2 echo "ERROR: Failed to download http://${DOWNLOAD_SERVER}/$1" 1>&2
exit 1 exit 1
fi fi
elif [ "$DOWNLOAD_SHOW_HTTP_WARNING" = "true" ]; then elif [ "$DOWNLOAD_SHOW_HTTP_WARNING" = "true" ]; then
...@@ -72,6 +72,14 @@ download_file() { ...@@ -72,6 +72,14 @@ download_file() {
fi fi
} }
download_sig() {
download_file $1 $2 noexit
if [ "$DOWNLOAD_VALIDATE" = "true" ]; then
echo "ERROR: Failed to download http://${DOWNLOAD_SERVER}/$1" 1>&2
exit 1
fi
}
gpg_setup() { gpg_setup() {
if [ "$DOWNLOAD_VALIDATE" = "false" ]; then if [ "$DOWNLOAD_VALIDATE" = "false" ]; then
return return
...@@ -263,8 +271,8 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ]; then ...@@ -263,8 +271,8 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ]; then
! download_file ${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}.asc \ ! download_file ${DOWNLOAD_INDEX_PATH}.${DOWNLOAD_COMPAT_LEVEL}.asc \
${DOWNLOAD_TEMP}/index.asc noexit; then ${DOWNLOAD_TEMP}/index.asc noexit; then
download_file ${DOWNLOAD_INDEX_PATH} ${DOWNLOAD_TEMP}/index normal download_file ${DOWNLOAD_INDEX_PATH} ${DOWNLOAD_TEMP}/index normal
download_file ${DOWNLOAD_INDEX_PATH}.asc \ download_sig ${DOWNLOAD_INDEX_PATH}.asc \
${DOWNLOAD_TEMP}/index.asc normal ${DOWNLOAD_TEMP}/index.asc
fi fi
gpg_validate ${DOWNLOAD_TEMP}/index.asc gpg_validate ${DOWNLOAD_TEMP}/index.asc
...@@ -298,14 +306,14 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ]; then ...@@ -298,14 +306,14 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ]; then
echo "Downloading the rootfs" echo "Downloading the rootfs"
download_file $DOWNLOAD_URL/rootfs.tar.xz \ download_file $DOWNLOAD_URL/rootfs.tar.xz \
${DOWNLOAD_TEMP}/rootfs.tar.xz normal ${DOWNLOAD_TEMP}/rootfs.tar.xz normal
download_file $DOWNLOAD_URL/rootfs.tar.xz.asc \ download_sig $DOWNLOAD_URL/rootfs.tar.xz.asc \
${DOWNLOAD_TEMP}/rootfs.tar.xz.asc normal ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc normal
gpg_validate ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc gpg_validate ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc
echo "Downloading the metadata" echo "Downloading the metadata"
download_file $DOWNLOAD_URL/meta.tar.xz \ download_file $DOWNLOAD_URL/meta.tar.xz \
${DOWNLOAD_TEMP}/meta.tar.xz normal ${DOWNLOAD_TEMP}/meta.tar.xz normal
download_file $DOWNLOAD_URL/meta.tar.xz.asc \ download_sig $DOWNLOAD_URL/meta.tar.xz.asc \
${DOWNLOAD_TEMP}/meta.tar.xz.asc normal ${DOWNLOAD_TEMP}/meta.tar.xz.asc normal
gpg_validate ${DOWNLOAD_TEMP}/meta.tar.xz.asc gpg_validate ${DOWNLOAD_TEMP}/meta.tar.xz.asc
...@@ -393,7 +401,7 @@ fi ...@@ -393,7 +401,7 @@ fi
# Replace variables in all templates # Replace variables in all templates
for file in $TEMPLATE_FILES; do for file in $TEMPLATE_FILES; do
[ ! -e "$file" ] && continue [ ! -f "$file" ] && continue
sed -i "s#LXC_NAME#$LXC_NAME#g" $file sed -i "s#LXC_NAME#$LXC_NAME#g" $file
sed -i "s#LXC_PATH#$LXC_PATH#g" $file sed -i "s#LXC_PATH#$LXC_PATH#g" $file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment