manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Echo_breakage for messages preceeding often-breaking stages and use before {c,}debootstrap calls

This commit is contained in:
Chris Lamb 2008-06-14 18:25:05 +01:00 committed by Daniel Baumann
parent 243ee8a6d3
commit 600d183d29
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
functions/echo.sh
View File

@ -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 ${@}
}

4
helpers/lh_bootstrap_cdebootstrap
View File

@ -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}" ]

4
helpers/lh_bootstrap_debootstrap
View File

@ -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}" ]