mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 16:57:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1811 from runejuhl/fix-alpine-apk-keys

Browse Source 
Change alpine template file check to also check file size (`-f` => `-s`)
This commit is contained in:
Stéphane Graber
2017-09-18 19:05:13 -04:00
committed by GitHub
parent 6cc7d050ca fc20af631e
commit aedfcb8acb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/lxc-alpine.in
View File

@@ -185,7 +185,7 @@ fetch_apk_keys() {
echo "$APK_KEYS_SHA256" | while read -r line; do
keyname="${line##* }"
if [ ! -f "$keyname" ]; then
if [ ! -s "$keyname" ]; then
fetch "$APK_KEYS_URI/$keyname" > "$keyname"
fi
echo "$line" | sha256sum -c -
@@ -210,7 +210,7 @@ fetch_apk_static() {
fetch "$MIRROR_URL/latest-stable/main/$arch/${pkg_name}-${pkg_ver}.apk" \
| tar -xz -C "$dest" sbin/ # --extract --gzip --directory
[ -f "$dest/sbin/apk.static" ] || die 2 'apk.static not found'
[ -s "$dest/sbin/apk.static" ] || die 2 'apk.static not found'
local keyname=$(echo "$dest"/sbin/apk.static.*.pub | sed 's/.*\.SIGN\.RSA\.//')
openssl dgst -sha1 \