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

Making handling of cache/packages_bootstrap a bit more error proove, thanks to Michal Suchanek <michal.suchanek@ruk.cuni.cz> for bringing it up.

This commit is contained in:
Daniel Baumann 2010-04-02 17:48:03 +02:00
parent 78a85f9b83
commit 66a1f5f07c
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpers/binary_debian-installer
View File

@ -415,14 +415,14 @@ then
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
# Including base debian packages
if [ -d cache/packages_bootstrap ]
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
for FILE in cache/packages_bootstrap/*.deb
do
Install_file "${FILE}" "binary/pool/main"
done
else
Echo_error "Could not find cache/packages_bootstrap."
Echo_error "Could not find packages in cache/packages_bootstrap."
Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
exit 1
fi

8
helpers/bootstrap_cdebootstrap
View File

@ -123,7 +123,7 @@ if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
then
if [ "${LH_CACHE_PACKAGES}" = "true" ]
then
if [ -d cache/packages_bootstrap ]
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
mkdir -p chroot/var/cache/bootstrap
cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
@ -138,14 +138,10 @@ then
fi
# Removing old cache
if [ -d cache/packages_bootstrap ]
then
rm -f cache/packages_bootstrap/*.deb
fi
rm -f cache/packages_bootstrap/*.deb
# Saving new cache
mkdir -p cache/packages_bootstrap
cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
fi

8
helpers/bootstrap_debootstrap
View File

@ -116,7 +116,7 @@ if [ -x "/usr/sbin/debootstrap" ]
then
if [ "${LH_CACHE_PACKAGES}" = "true" ]
then
if [ -d cache/packages_bootstrap ]
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
mkdir -p chroot/var/cache/apt/archives
cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
@ -131,14 +131,10 @@ then
fi
# Removing old cache
if [ -d cache/packages_bootstrap ]
then
rm -f cache/packages_bootstrap/*.deb
fi
rm -f cache/packages_bootstrap/*.deb
# Saving new cache
mkdir -p cache/packages_bootstrap
cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
fi