summaryrefslogtreecommitdiffstats
path: root/lbu.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-11-22 14:42:36 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-11-22 14:42:36 +0000
commitd43136f093e2893457c4e0d944925c97ba86effc (patch)
tree815141283bd897220682f424a88128558b97d8a1 /lbu.in
parent620ede7ef9bf89d6c7924203ee6912e7b5abae7a (diff)
downloadalpine-conf-d43136f093e2893457c4e0d944925c97ba86effc.tar.bz2
alpine-conf-d43136f093e2893457c4e0d944925c97ba86effc.tar.xz
lbu: fix lbu status for encrypted apkovls
http://redmine.alpinelinux.org/issues/480
Diffstat (limited to 'lbu.in')
-rw-r--r--lbu.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/lbu.in b/lbu.in
index 527b9e7..309a8ab 100644
--- a/lbu.in
+++ b/lbu.in
@@ -140,6 +140,9 @@ unpack_apkovl() {
local count=0
mkdir -p "$dest"
mount_once "$mnt"
+ if [ -n "$ENCRYPTION" ]; then
+ f="$f.$ENCRYPTION"
+ fi
if [ ! -f "$mnt/$f" ]; then
return 1
fi
@@ -147,7 +150,6 @@ unpack_apkovl() {
tar -C "$dest" -zxf "$mnt/$f"
return
fi
- f="$f.$ENCRYPTION"
check_openssl
while [ $count -lt 3 ]; do
$OPENSSL enc -d -$ENCRYPTION -in "$mnt/$f" | tar \
@@ -564,7 +566,10 @@ cmd_status() {
unpack_apkovl "$tmp/a"
# generate new apkovl and extract to tmpdir/b
+ local save_encryption="$ENCRYPTION"
+ ENCRYPTION=
cmd_package - | tar -C "$tmp/b" -zx
+ ENCRYPTION="$save_encryption"
# show files that exists in a but not in b as deleted
local f