summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-01-02 00:36:20 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:40 +0100
commit21815cb707e78ed1899c74c09503cc5b696383e6 (patch)
tree9d2bdd949f2e5e08556b6570316d99cb15910550 /functions
parent8c19e13179e0bb298adb28d84fb778a717be1fad (diff)
downloadvyos-live-build-21815cb707e78ed1899c74c09503cc5b696383e6.tar.gz
vyos-live-build-21815cb707e78ed1899c74c09503cc5b696383e6.zip
Generalizing compression handling and adding support for lzip tarballs.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 35185e56d..10fd1f152 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -45,6 +45,8 @@ Set_defaults ()
APT_OPTIONS="${APT_OPTIONS:---yes}"
APTITUDE_OPTIONS="${APTITUDE_OPTIONS:---assume-yes}"
+ BZIP2_OPTIONS="${BZIP2_OPTIONS:---best}"
+
GZIP_OPTIONS="${GZIP_OPTIONS:---best}"
if gzip --help | grep -qs "\-\-rsyncable"
@@ -52,6 +54,8 @@ Set_defaults ()
GZIP_OPTIONS="$(echo ${GZIP_OPTIONS} | sed -e 's|--rsyncable||') --rsyncable"
fi
+ LZIP_OPTIONS="${LZIP_OPTIONS:--best}"
+
# Setting apt recommends
case "${LB_MODE}" in
emdebian)
@@ -704,6 +708,9 @@ Set_defaults ()
# Setting checksums
LB_CHECKSUMS="${LB_CHECKSUMS:-md5}"
+ # Setting compression
+ LB_COMPRESSION="${LB_COMPRESSION:gzip}"
+
# Setting chroot option
LB_BUILD_WITH_CHROOT="${LB_BUILD_WITH_CHROOT:-true}"
@@ -877,7 +884,7 @@ Set_defaults ()
LB_NET_COW_FILESYSTEM="${LB_NET_COW_FILESYSTEM:-nfs}"
# Setting net tarball
- LB_NET_TARBALL="${LB_NET_TARBALL:-gzip}"
+ LB_NET_TARBALL="${LB_NET_TARBALL:-true}"
# Setting syslinux theme package
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-debian-squeeze}"