diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-14 18:25:05 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:35 +0100 |
| commit | 600d183d2967ed32cba4f89ebc5f9874f7ce42ff (patch) | |
| tree | 211f559135253e3b5e512e0c3c5eae0977e1b916 | |
| parent | 243ee8a6d3cfdcfaa3aa73b7a301f5973fcb2a6a (diff) | |
| download | live-build-600d183d2967ed32cba4f89ebc5f9874f7ce42ff.zip live-build-600d183d2967ed32cba4f89ebc5f9874f7ce42ff.tar.gz | |
Add Echo_breakage for messages preceeding often-breaking stages and use before {c,}debootstrap calls
| -rwxr-xr-x | functions/echo.sh | 16 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 4 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_debootstrap | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/functions/echo.sh b/functions/echo.sh index 963e125..5c641d2 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -52,3 +52,19 @@ Echo_warning () echo "W: ${STRING}" } + +Echo_breakage () +{ + Echo_message "If the following stage fails, the most likely cause of the problem is with" + + case "${LH_DISTRIBUTION}" in + sid|unstable) + Echo_message "your mirror configuration, a caching proxy or the sid distribution." + ;; + *) + Echo_message "your mirror configuration or a caching proxy." + ;; + esac + + Echo_message ${@} +} diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 5d2f22e..557831f 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -134,7 +134,7 @@ then cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap fi - # Executing cdebootstrap (download-only) + Echo_breakage "Running cdebootstrap (download-only)... " ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" if [ -n "${LH_ROOT_COMMAND}" ] @@ -154,7 +154,7 @@ then cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap fi - # Executing cdebootstrap (regular run) + Echo_breakage "Running cdebootstrap... " ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" if [ -n "${LH_ROOT_COMMAND}" ] diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 4245581..dcf1052 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -120,7 +120,7 @@ then cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives fi - # Executing debootstrap (download-only) + Echo_breakage "Running debootstrap (download-only)... " ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}" if [ -n "${LH_ROOT_COMMAND}" ] @@ -140,7 +140,7 @@ then cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap fi - # Executing debootstrap (regular run) + Echo_breakage "Running debootstrap... " ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}" if [ -n "${LH_ROOT_COMMAND}" ] |