summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2008-01-21 08:58:34 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2008-01-21 08:58:34 +0000
commita5e55b7da70c1f7771e5c5e767e48e2a0be7b191 (patch)
tree71ac168ac0cd2daae41faedf95d71a884092e8a8
parente167427963d3cd7899bce8a55c7ec5b6907d8fdf (diff)
downloadalpine-conf-a5e55b7da70c1f7771e5c5e767e48e2a0be7b191.zip
version 1.2
-rw-r--r--Makefile2
-rw-r--r--lbu9
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 509af6c..e735074 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=1.1.1
+V=1.2
P=alpine-conf
PV=$(P)-$(V)
APKF=$(PV).apk
diff --git a/lbu b/lbu
index ce8445f..76400e8 100644
--- a/lbu
+++ b/lbu
@@ -233,6 +233,7 @@ cmd_package() {
rc=$?
fi
fi
+ cd "$owd"
# actually commit unless dryrun mode
if [ $rc -eq 0 ]; then
@@ -241,8 +242,6 @@ cmd_package() {
else
rm -f "$CURRENT_TDB"
fi
-
- cd "$owd"
return $rc
}
@@ -276,7 +275,7 @@ Options:
-d Remove old apk overlay files.
-e Protect configuration with a password.
-n Don't commit, just show what would have been commited.
- -p <password> Give encryption password on the command-line
+ -p <password> Give encryption password on the command-line
-v Verbose mode.
The following values for <media> is supported: floppy usb
@@ -286,8 +285,8 @@ Password protection will use $DEFAULT_CIPHER encryption. Other ciphers can be
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 PASSWORD environment variable in /etc/lbu/lbu.conf
+The password used to encrypt the file, can either be specified with the -p
+option or using the PASSWORD environment variable.
The environment varialbes can also be set in $LBU_CONF
"