summaryrefslogtreecommitdiff
path: root/helpers/lh_bootstrap_cdebootstrap
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-23 00:00:48 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:40 +0100
commit451d36016c116b552604cfe1d05f181894cdba69 (patch)
tree0a2479b58f80edc1717ea189d229922aebbae9a1 /helpers/lh_bootstrap_cdebootstrap
parente51e734b00bb75a9bf2eb84559bb852e13589246 (diff)
downloadlive-build-451d36016c116b552604cfe1d05f181894cdba69.zip
live-build-451d36016c116b552604cfe1d05f181894cdba69.tar.gz
Adding support for using cdebootstra-static as bootstrap program.
Diffstat (limited to 'helpers/lh_bootstrap_cdebootstrap')
-rwxr-xr-xhelpers/lh_bootstrap_cdebootstrap16
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 36cc855..6ab5c52 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -28,7 +28,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
+if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ] && [ "${LH_BOOTSTRAP}" != "cdebootstrap-static" ]
then
exit 0
fi
@@ -38,7 +38,7 @@ Check_crossarchitecture
Echo_message "Begin bootstrapping system..."
-Check_package /usr/bin/cdebootstrap cdebootstrap
+Check_package /usr/bin/${LH_BOOTSTRAP} cdebootstrap
# Ensure that a system is built as root
lh_testroot
@@ -124,7 +124,7 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated"
fi
-if [ -x "/usr/bin/cdebootstrap" ]
+if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
then
if [ "${LH_CACHE_PACKAGES}" = "enabled" ]
then
@@ -134,8 +134,8 @@ then
cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
fi
- Echo_breakage "Running cdebootstrap (download-only)... "
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+ Echo_breakage "Running ${LH_BOOTSTRAP} (download-only)... "
+ ${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -154,8 +154,8 @@ then
cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
fi
- Echo_breakage "Running cdebootstrap... "
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+ Echo_breakage "Running ${LH_BOOTSTRAP}... "
+ ${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -180,6 +180,6 @@ then
# Creating stage file
Create_stagefile .stage/bootstrap
else
- Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
+ Echo_error "Can't process file /usr/bin/${LH_BOOTSTRAP} (FIXME)"
exit 1
fi