diff --git a/Makefile b/Makefile index 1dc5d0a0a16193e4f47b57367508c3c8b7099265..509af6c4e58028b9b2fe566bb7bfb0dcac3b2a44 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=1.1 +V=1.1.1 P=alpine-conf PV=$(P)-$(V) APKF=$(PV).apk diff --git a/lbu b/lbu index 987bffc56be7bb5df50d46ae7c2aac0b480d3ebf..ce8445f1736ad1133e373d0fbedee1ffab0d4a18 100644 --- a/lbu +++ b/lbu @@ -287,7 +287,7 @@ used by setting the DEFAULT_CIPHER or ENCRYPTION environment variables. For possible ciphers, try: openssl -v The password used to encrypt the file, can either be specified on the command line -(following -p) or using the ENCRYPTION environment variable in /etc/lbu/lbu.conf +(following -p) or using the PASSWORD environment variable in /etc/lbu/lbu.conf The environment varialbes can also be set in $LBU_CONF " @@ -370,6 +370,7 @@ cmd_commit() { # move current to commited. [ "$DRYRUN" ] || mv "$CURRENT_TDB" "$COMMITED_TDB" + vecho "Successfully saved apk overlay files" } #--------------------------------------------------------------------------- @@ -512,7 +513,7 @@ while getopts "adehlM:np:qrv" opt ; do ;; d) DELETEOLDCONFIGS="yes" ;; - e) ENCRYPTION="$DEFAULT_CIPHER" + e) [ -z "$ENCRYPTION" ] && ENCRYPTION="$DEFAULT_CIPHER" ;; h) usage_$SUBCMD ;;