summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-06-21 22:26:11 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:11 +0100
commit575648476f5ae8316d26b6107d403400f8ad35e5 (patch)
treea650d286310a1c544ce7177f8273c6278911fe1e
parent5937ff349777dd2eeb76101461b79cf99915dba8 (diff)
downloadvyos-live-build-575648476f5ae8316d26b6107d403400f8ad35e5.tar.gz
vyos-live-build-575648476f5ae8316d26b6107d403400f8ad35e5.zip
Correcting wrong handling of --rsyncable in defaults autodetection of gzip options.
-rwxr-xr-xfunctions/defaults.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index e16635dae..c395af00f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -73,12 +73,9 @@ Set_defaults ()
GZIP_OPTIONS="${GZIP_OPTIONS:---best}"
- if gzip --help | grep -qs "\-\-rsyncable" && \
- ! echo ${GZIP_OPTIONS} | grep -q rsyncable
+ if gzip --help | grep -qs "\-\-rsyncable"
then
- GZIP_OPTIONS="${GZIP_OPTIONS} --rsyncable"
- else
- GZIP_OPTIONS="$(echo ${GZIP_OPTIONS} | sed -e 's|--rsyncable||')"
+ GZIP_OPTIONS="$(echo ${GZIP_OPTIONS} | sed -e 's|--rsyncable||') --rsyncable"
fi
# Setting apt recommends