diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-02 13:05:03 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-02 13:06:17 +0100 |
| commit | 5f318c5a444ef05bdf79b1f7640294c7423fd10e (patch) | |
| tree | d03b275885c53762760bd0c2a6b0df0d42802cce /scripts/build | |
| parent | d7d0798e4681bb7f5c1a1836df854a72d2772113 (diff) | |
| download | vyos-live-build-5f318c5a444ef05bdf79b1f7640294c7423fd10e.tar.gz vyos-live-build-5f318c5a444ef05bdf79b1f7640294c7423fd10e.zip | |
tidy up Echo_breakage()
- it's only used by the debootstrap script after alternatives were dropped
long ago, so let's move it, avoiding it being loaded for everything
else.
- there's no need to pass printing another message through it.
- there's little point in making the sid distinction if you happen to
decide to build sid, it's a given that it's less stable than stable.
really, is there any need for this at all?
Gbp-Dch: Ignore
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index fe61451ba..5373fcc53 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -42,6 +42,11 @@ Check_stagefile "bootstrap_cache.restore" # Acquire lock file Acquire_lockfile +Print_breakage () +{ + Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration or a caching proxy." +} + # Creating chroot directory mkdir -p chroot @@ -79,7 +84,8 @@ then cp cache/packages.bootstrap/*.deb chroot/var/cache/apt/archives fi - Echo_breakage "Running debootstrap (download-only)... " + Print_breakage + Echo_message "Running debootstrap (download-only)..." debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} # Removing old cache @@ -90,7 +96,8 @@ then cp chroot/var/cache/apt/archives/*.deb cache/packages.bootstrap fi -Echo_breakage "Running debootstrap... " +Print_breakage +Echo_message "Running debootstrap..." # Run appropriate bootstrap, i.e. foreign or regular bootstrap if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" = "${LB_ARCHITECTURE}" ]; then |