aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Guilbault <philippe.guilbault@gmail.com>2016-12-10 23:01:17 -0500
committerNatanael Copa <ncopa@alpinelinux.org>2016-12-11 15:00:33 +0000
commit07af120c15cae0ed586fac7bedfc9cdfb89bf07d (patch)
treec9d2ea1de128632906b7bddb341283c4faf34ead
parentcd395b7ece50492d51d8b1708ec91adf529ead18 (diff)
downloadalpine-conf-07af120c15cae0ed586fac7bedfc9cdfb89bf07d.tar.bz2
alpine-conf-07af120c15cae0ed586fac7bedfc9cdfb89bf07d.tar.xz
setup-disk fails because of 'lbu package | tar' & encryption config
-rw-r--r--lbu.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/lbu.in b/lbu.in
index 71301fe..a0c5d4f 100644
--- a/lbu.in
+++ b/lbu.in
@@ -303,7 +303,7 @@ cmd_package() {
run-parts "$LBU_PREPACKAGE" >&2 || return 1
fi
- [ -n "$ENCRYPTION" ] && suff="$suff.$ENCRYPTION"
+ [ -n "$ENCRYPTION" ] && [ "x$pkg" != "x-" ] && suff="$suff.$ENCRYPTION"
# find filename
if [ -d "$pkg" ] ; then
@@ -332,7 +332,7 @@ cmd_package() {
rc=$?
fi
if [ $rc -eq 0 ]; then
- if [ -z "$ENCRYPTION" ]; then
+ if [ -z "$ENCRYPTION" ] || [ "x$pkg" = "x-" ]; then
_gen_filelist | $tar_create -z >"$tmppkg"
rc=$?
else