diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-05 19:22:14 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 09:38:02 +0000 |
| commit | 78b03ce8a32f8e643e84ed9d4b3bde15943c2f19 (patch) | |
| tree | 138b53b6d8b8a0865a821b9755a336766f4132b0 /scripts/build | |
| parent | 38a5aed0dcdf71f43cecfadc6e34c659408b6a00 (diff) | |
| download | vyos-live-build-78b03ce8a32f8e643e84ed9d4b3bde15943c2f19.tar.gz vyos-live-build-78b03ce8a32f8e643e84ed9d4b3bde15943c2f19.zip | |
bootstrap_archives: remove useless param
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/bootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_archives | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index 08229a393..56d62e481 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -35,7 +35,7 @@ lb bootstrap_cache save "${@}" # Configuring chroot lb chroot_prep install all-except-archives "${@}" -lb bootstrap_archives binary "${@}" +lb bootstrap_archives "${@}" # Deconfiguring chroot lb chroot_prep remove all-except-archives "${@}" diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index 4dc07bffe..18e992838 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -16,14 +16,7 @@ set -e # Setting static variables DESCRIPTION="Manage /etc/apt/sources.list" -USAGE="${PROGRAM} {source|binary} [--force]" - -_PASS="${1}" -shift - -if [ "${_PASS}" != "binary" ] && [ "${_PASS}" != "source" ]; then - Usage -fi +USAGE="${PROGRAM} [--force]" # Processing arguments and configuration files Init_config_data "${@}" @@ -49,7 +42,7 @@ then fi # Configure custom sources.list -Create_apt_sources_list chroot "${_PASS}" +Create_apt_sources_list chroot # Adding local apt sources (chroot) for FILE in config/archives/*.list config/archives/*.list.chroot @@ -61,12 +54,6 @@ do -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" - - if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] - then - # Disable source archives - sed -i "s/^deb-src/#deb-src/g" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" - fi fi done |