From 4b334e45270e2ea0fb5cae1e82a3de5c8905fb4b Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 15 Apr 2018 15:08:56 +0200 Subject: [PATCH] [deployiso] rm default bw-limit [deployiso] limit isn't empty but zero Revert "[deployiso] limit isn't empty but zero" This reverts commit 8bb98a2b650f5d938bc3a039523f95e6d55ff072. correction --- bin/deployiso.in | 6 ++---- lib/util.sh | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/deployiso.in b/bin/deployiso.in index 153a449..0f6b1d4 100644 --- a/bin/deployiso.in +++ b/bin/deployiso.in @@ -37,7 +37,7 @@ display_settings(){ msg2 "is_build_list: %s" "${is_build_list}" msg "OPTIONS:" - msg2 "limit: %s kB/s" "${limit}" + [[ -z ${limit} ]] && msg2 "bandwidth limit: no" || msg2 "bandwidth limit: %s kB/s" "${limit}" msg2 "dist_release: %s" "${dist_release}" msg "ARGS:" @@ -94,7 +94,7 @@ opts='dhl:p:qtuv' while getopts "${opts}" arg; do case "${arg}" in d) hidden=true ;; - l) limit="$OPTARG" ;; + l) limit="$OPTARG"; rsync_args+=(--bwlimit=${limit}) ;; p) build_list_iso="$OPTARG" ;; q) pretend=true; rsync_args+=(-n) ;; t) torrent=true ;; @@ -111,8 +111,6 @@ timer_start=$(get_timer) eval_build_list "${list_dir_iso}" "${build_list_iso}" -rsync_args+=(--bwlimit=${limit}) - ${pretend} && display_settings && exit 1 run sync_dir "${build_list_iso}" diff --git a/lib/util.sh b/lib/util.sh index 0edd1c2..904ddaf 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -326,8 +326,6 @@ init_deployiso(){ [[ -z ${account} ]] && account="[SetUser]" - [[ -z ${limit} ]] && limit=100 - [[ -z ${tracker_url} ]] && tracker_url='udp://mirror.strits.dk:6969' [[ -z ${piece_size} ]] && piece_size=21