...
 
Commits (5)
VERSION := 2.8.1
VERSION := 2.8.2
sysconfdir ?= /etc/lbu
......
......@@ -265,7 +265,7 @@ cmd_package() {
local rc=0
local owd="$PWD"
local suff="apkovl.tar.gz"
local tmpdir tmppkg
local tmpdir tmppkg tmpexclude tmpinclude
check_openssl
init_tmpdir tmpdir
......@@ -284,6 +284,8 @@ cmd_package() {
fi
tmppkg="$tmpdir/$(basename $pkg)"
tmpexclude="$tmpdir"/exclude
tmpinclude="$tmpdir"/include
cd "${ROOT:-/}"
# remove old package.list
......@@ -293,8 +295,16 @@ cmd_package() {
rm -f etc/lbu/packages.list
fi
# create tar archive
[ -f "$EXCLUDE_LIST" ] && excl="-X $EXCLUDE_LIST"
[ -f "$INCLUDE_LIST" ] && incl="-T $INCLUDE_LIST"
if [ -f "$EXCLUDE_LIST" ]; then
# strip empty lines and lines with only whitespace
sed -e '/^[[:space:]]*$/d' "$EXCLUDE_LIST" > $tmpexclude
excl="-X $tmpexclude"
fi
if [ -f "$INCLUDE_LIST" ]; then
# strip empty lines and lines with only whitespace
sed -e '/^[[:space:]]*$/d' "$INCLUDE_LIST" > $tmpinclude
incl="-T $tmpinclude"
fi
if [ -n "$VERBOSE" ]; then
echo "Archiving the following files:" >&2
# we dont want to mess the tar output with the
......
......@@ -612,8 +612,8 @@ data_only_disk_install_lvm() {
data_only_disk_install() {
local diskdev=
local var_dev=/dev/$vgname/lv_var
local var_part_type="8e"
local var_dev=
local var_part_type="83"
local swap_part_type=82
local size=
local swap_dev= var_dev=
......
......@@ -18,7 +18,9 @@ done
echon "] "
default_read dns "$dns"
echo "search $domain" > $conf
if [ "$domain" != "" ]; then
echo "search $domain" > $conf
fi
for i in $dns ; do
echo "nameserver $i" >> $conf
done
......
......@@ -66,7 +66,7 @@ while true; do
echo $TZ > /etc/TZ || rm -f /etc/TZ
break
fi
echo "'$zonepath' is not a vaild timezone on this system"
echo "'$zonepath' is not a valid timezone on this system"
done
if [ -n "$apkdel" ]; then
......