[SCM] live-build branch, debian-next, updated. debian/2.0_a26-1-2-g493c448
Daniel Baumann
daniel at debian.org
Tue Sep 7 13:14:18 UTC 2010
The following commit has been merged in the debian-next branch:
commit 493c4488bfb24e9553e79ba84441167d5757a3e1
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Sep 7 15:11:20 2010 +0200
Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.
diff --git a/cgi/cgi b/cgi/cgi
index c52fe23..2ab6e5b 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -9,7 +9,7 @@
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Reading defaults
if [ -r /etc/default/live-build.cgi ]
@@ -37,9 +37,9 @@ cat "${_TEMPLATES}"/header.html
if [ -z "${QUERY_STRING}" ]
then
# Sending html form
- sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
- -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
- -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
+ sed -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
+ -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \
+ -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \
-e "s/VERSION/${VERSION}/" \
-e "s/DATE/`date +%Y%m%d-%H:%M`/" \
"${_TEMPLATES}"/form.html
@@ -62,45 +62,45 @@ else
_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
# Standard options
- LH_BINARY_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_PACKAGES_LISTS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages_lists=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_TASKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])tasks=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
- LH_PACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
+ LB_BINARY_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_PACKAGES_LISTS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages_lists=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_TASKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])tasks=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
+ LB_PACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])packages=[-0-9a-zA-Z. _]+' | cut -f 2 -d '=' | head -n1)
# Advanced bootstrap options
- LH_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced chroot options
- LH_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_LINUX_FLAVOURS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])linux_flavours=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SYMLINKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])symlinks=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SYSVINIT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sysvinit=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_LINUX_FLAVOURS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])linux_flavours=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SYMLINKS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])symlinks=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SYSVINIT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sysvinit=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced binary options
- LH_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
- LH_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
- LH_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1)
- LH_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
- LH_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
- LH_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
- LH_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
+ LB_BINARY_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_indices=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
+ LB_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
+ LB_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1)
+ LB_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1)
+ LB_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
+ LB_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
+ LB_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
# Advanced source options
- LH_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
- LH_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
+ LB_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Unofficial options
_CUSTOM_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])custom_bootstrap=[-0-9a-zA-Z.~:/_]+' | cut -f 2 -d '=' | head -n1)
@@ -113,9 +113,9 @@ else
then
echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>"
- sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
- -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
- -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
+ sed -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
+ -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \
+ -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \
-e "s/VERSION/${VERSION}/" \
-e "s/DATE/`date +%Y%m%d-%H:%M`/" \
"${_TEMPLATES}"/form.html
@@ -131,38 +131,38 @@ else
# Note: On each string remember to use a delimeter that is not in the string.
sed -e "s/BUILD/${_BUILD}/g" \
-e "s/EMAIL/${_EMAIL}/" \
- -e "s/LH_BINARY_IMAGES/${LH_BINARY_IMAGES}/" \
- -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" \
- -e "s/LH_PACKAGES_LISTS/${LH_PACKAGES_LISTS}/" \
- -e "s/LH_TASKS/${LH_TASKS}/" \
- -e "s/LH_PACKAGES/${LH_PACKAGES}/" \
- -e "s/LH_ARCHITECTURE/${LH_ARCHITECTURE}/" \
- -e "s/LH_BOOTSTRAP_FLAVOUR/${LH_BOOTSTRAP_FLAVOUR}/" \
- -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
- -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
- -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
- -e "s/LH_ARCHIVE_AREAS/${LH_ARCHIVE_AREAS}/" \
- -e "s/LH_CHROOT_FILESYSTEM/${LH_CHROOT_FILESYSTEM}/" \
- -e "s/LH_LINUX_FLAVOURS/${LH_LINUX_FLAVOURS}/" \
- -e "s/LH_SECURITY/${LH_SECURITY}/" \
- -e "s/LH_SYMLINKS/${LH_SYMLINKS}/" \
- -e "s/LH_SYSVINIT/${LH_SYSVINIT}/" \
- -e "s/LH_BINARY_INDICES/${LH_BINARY_INDICES}/" \
- -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" \
- -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" \
- -e "s/LH_BOOTLOADER/${LH_BOOTLOADER}/" \
- -e "s/LH_DEBIAN_INSTALLER/${LH_DEBIAN_INSTALLER}/" \
- -e "s/LH_ENCRYPTION/${LH_ENCRYPTION}/" \
- -e "s#LH_ISO_APPLICATION#${LH_ISO_APPLICATION}#" \
- -e "s#LH_ISO_PREPARER#${LH_ISO_PREPARER}#" \
- -e "s#LH_ISO_PUBLISHER#${LH_ISO_PUBLISHER}#" \
- -e "s#LH_ISO_VOLUME#${LH_ISO_VOLUME}#" \
- -e "s/LH_MEMTEST/${LH_MEMTEST}/" \
- -e "s#LH_NET_ROOT_PATH#${LH_NET_ROOT_PATH}#" \
- -e "s/LH_NET_ROOT_SERVER/${LH_NET_ROOT_SERVER}/" \
+ -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \
+ -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
+ -e "s/LB_PACKAGES_LISTS/${LB_PACKAGES_LISTS}/" \
+ -e "s/LB_TASKS/${LB_TASKS}/" \
+ -e "s/LB_PACKAGES/${LB_PACKAGES}/" \
+ -e "s/LB_ARCHITECTURE/${LB_ARCHITECTURE}/" \
+ -e "s/LB_BOOTSTRAP_FLAVOUR/${LB_BOOTSTRAP_FLAVOUR}/" \
+ -e "s#LB_MIRROR_BOOTSTRAP#${LB_MIRROR_BOOTSTRAP}#" \
+ -e "s#LB_MIRROR_BINARY_SECURITY#${LB_MIRROR_BINARY_SECURITY}#" \
+ -e "s#LB_MIRROR_BINARY#${LB_MIRROR_BINARY}#" \
+ -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
+ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
+ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
+ -e "s/LB_SECURITY/${LB_SECURITY}/" \
+ -e "s/LB_SYMLINKS/${LB_SYMLINKS}/" \
+ -e "s/LB_SYSVINIT/${LB_SYSVINIT}/" \
+ -e "s/LB_BINARY_INDICES/${LB_BINARY_INDICES}/" \
+ -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
+ -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
+ -e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \
+ -e "s/LB_DEBIAN_INSTALLER/${LB_DEBIAN_INSTALLER}/" \
+ -e "s/LB_ENCRYPTION/${LB_ENCRYPTION}/" \
+ -e "s#LB_ISO_APPLICATION#${LB_ISO_APPLICATION}#" \
+ -e "s#LB_ISO_PREPARER#${LB_ISO_PREPARER}#" \
+ -e "s#LB_ISO_PUBLISHER#${LB_ISO_PUBLISHER}#" \
+ -e "s#LB_ISO_VOLUME#${LB_ISO_VOLUME}#" \
+ -e "s/LB_MEMTEST/${LB_MEMTEST}/" \
+ -e "s#LB_NET_ROOT_PATH#${LB_NET_ROOT_PATH}#" \
+ -e "s/LB_NET_ROOT_SERVER/${LB_NET_ROOT_SERVER}/" \
-e "s#SERVER#${_SERVER}#g" \
- -e "s/LH_SOURCE_IMAGES/${LH_SOURCE_IMAGES}/" \
- -e "s/LH_SOURCE/${LH_SOURCE}/" \
+ -e "s/LB_SOURCE_IMAGES/${LB_SOURCE_IMAGES}/" \
+ -e "s/LB_SOURCE/${LB_SOURCE}/" \
-e "s#CUSTOM_BOOTSTRAP#${_CUSTOM_BOOTSTRAP}#" \
-e "s#CUSTOM_BINARY#${_CUSTOM_BINARY}#" \
"${_TEMPLATES}"/build.html
@@ -181,55 +181,55 @@ _EMAIL="${_EMAIL}"
REMOTE_ADDR="${REMOTE_ADDR}"
# Standard options
-LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
-LH_DISTRIBUTION="${LH_DISTRIBUTION}"
-LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
-LH_TASKS="${LH_TASKS}"
-LH_PACKAGES="${LH_PACKAGES}"
+LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
+LB_DISTRIBUTION="${LB_DISTRIBUTION}"
+LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS}"
+LB_TASKS="${LB_TASKS}"
+LB_PACKAGES="${LB_PACKAGES}"
# Advanced bootstrap options
-LH_ARCHITECTURE="${LH_ARCHITECTURE}"
-LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
-LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
-LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
-LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
+LB_ARCHITECTURE="${LB_ARCHITECTURE}"
+LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"
+LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
+LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
+LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
# Advanced chroot options
-LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
-LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
-LH_SECURITY="${LH_SECURITY}"
-LH_SYMLINKS="${LH_SYMLINKS}"
-LH_SYSVINIT="${LH_SYSVINIT}"
+LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
+LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}"
+LB_SECURITY="${LB_SECURITY}"
+LB_SYMLINKS="${LB_SYMLINKS}"
+LB_SYSVINIT="${LB_SYSVINIT}"
# Advanced binary options
-LH_BINARY_INDICES="${LH_BINARY_INDICES}"
-LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
-LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
-LH_BOOTLOADER="${LH_BOOTLOADER}"
-LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
-LH_ENCRYPTION="${LH_ENCRYPTION}"
-LH_ISO_APPLICATION="${LH_ISO_APPLICATION}"
-LH_ISO_PREPARER="${LH_ISO_PREPARER}"
-LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
-LH_ISO_VOLUME="${LH_ISO_VOLUME}"
-LH_MEMTEST="${LH_MEMTEST}"
-LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
-LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
+LB_BINARY_INDICES="${LB_BINARY_INDICES}"
+LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
+LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
+LB_BOOTLOADER="${LB_BOOTLOADER}"
+LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER}"
+LB_ENCRYPTION="${LB_ENCRYPTION}"
+LB_ISO_APPLICATION="${LB_ISO_APPLICATION}"
+LB_ISO_PREPARER="${LB_ISO_PREPARER}"
+LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}"
+LB_ISO_VOLUME="${LB_ISO_VOLUME}"
+LB_MEMTEST="${LB_MEMTEST}"
+LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}"
+LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}"
# Advanced source options
-LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
-LH_SOURCE="${LH_SOURCE}"
+LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
+LB_SOURCE="${LB_SOURCE}"
# Unofficial options
_CUSTOM_BOOTSTRAP="${_CUSTOM_BOOTSTRAP}"
_CUSTOM_BINARY="${_CUSTOM_BINARY}"
# Other
-LH_REPOSITORIES="${LH_REPOSITORIES}"
+LB_REPOSITORIES="${LB_REPOSITORIES}"
EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-build.cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
- echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-build.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|tasks ${LH_TASKS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|archive_areas ${LH_ARCHIVE_AREAS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend_install ${LH_BOOTAPPEND_INSTALL}|bootappend_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH
_MEMTEST}|net_path ${LH_NET_ROOT_PATH}|net_server ${LH_NET_ROOT_SERVER}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
+ echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-build.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|packages_lists ${LB_PACKAGES_LISTS}|tasks ${LB_TASKS}|packages ${LB_PACKAGES}|architecture ${LB_ARCHITECTURE}|mirror_bootstrap_security ${LB_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LB_MIRROR_BOOTSTRAP}|mirror_binary_security ${LB_MIRROR_BINARY_SECURITY}|mirror_binary ${LB_MIRROR_BINARY}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|symlinks ${LB_SYMLINKS}|sysvinit ${LB_SYSVINIT}|binary_indices ${LB_BINARY_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|encryption ${LB_ENCRYPTION}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB
_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|source ${LB_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
diff --git a/cgi/cron b/cgi/cron
index bfac306..1cbf018 100755
--- a/cgi/cron
+++ b/cgi/cron
@@ -9,7 +9,7 @@
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Reading defaults
if [ -r /etc/default/live-build.cgi ]
@@ -66,10 +66,10 @@ then
_EMAIL=`awk -F\" '/^_EMAIL=/{print $2}' ${_FILE}`
# Pull in the remote address, atchitecture, and distribution
_REMOTE_ADDR=`awk -F\" '/^REMOTE_ADDR=/{print $2}' ${_FILE}`
- _LH_ARCHITECTURE=`awk -F\" '/^LH_ARCHITECTURE=/{print $2}' ${_FILE}`
- _LH_DISTRIBUTION=`awk -F\" '/^LH_DISTRIBUTION=/{print $2}' ${_FILE}`
- _LH_PACKAGES_LISTS=`awk -F\" '/^LH_PACKAGES_LISTS=/{print $2}' ${_FILE}`
- _LH_PACKAGES=`awk -F\" '/^LH_PACKAGES=/{print $2}' ${_FILE}`
+ _LB_ARCHITECTURE=`awk -F\" '/^LB_ARCHITECTURE=/{print $2}' ${_FILE}`
+ _LB_DISTRIBUTION=`awk -F\" '/^LB_DISTRIBUTION=/{print $2}' ${_FILE}`
+ _LB_PACKAGES_LISTS=`awk -F\" '/^LB_PACKAGES_LISTS=/{print $2}' ${_FILE}`
+ _LB_PACKAGES=`awk -F\" '/^LB_PACKAGES=/{print $2}' ${_FILE}`
# Pull in the custom bootstrap
_CUSTOM_BOOTSTRAP=`awk -F\" '/^_CUSTOM_BOOTSTRAP=/{print $2}' ${_FILE}`
# Pull in the custom binary
@@ -112,10 +112,10 @@ then
if [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
then
_STATUS="maybe-successful"
- echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LH_ARCHITECTURE}/${_LH_DISTRIBUTION}/${_LH_PACKAGES_LISTS}/${_LH_PACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURE}/${_LB_DISTRIBUTION}/${_LB_PACKAGES_LISTS}/${_LB_PACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
else
_STATUS="maybe-failed"
- echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LH_ARCHITECTURE}/${_LH_DISTRIBUTION}/${_LH_PACKAGES_LISTS}/${_LH_PACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
+ echo "${_REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${_LB_ARCHITECTURE}/${_LB_DISTRIBUTION}/${_LB_PACKAGES_LISTS}/${_LB_PACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
fi
sed -e "s/BUILD/${_BUILD}/g" \
diff --git a/cgi/default b/cgi/default
index b3a3729..37a879b 100644
--- a/cgi/default
+++ b/cgi/default
@@ -10,8 +10,8 @@ _DESTDIR="/srv/debian-live/build/www"
_TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}"
_TEMPDIR="/srv/debian-live/build/tmp"
-LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
-LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+LB_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+LB_MIRROR_BINARY="http://ftp.debian.org/debian/"
+LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
_SERVER="http://live.debian.net/build"
diff --git a/functions/architecture.sh b/functions/architecture.sh
index 9e6a49a..b497293 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -15,7 +15,7 @@ Check_architecture ()
for ARCHITECTURE in ${ARCHITECTURES}
do
- if [ "$(echo ${LH_ARCHITECTURE} | grep ${ARCHITECTURE})" ]
+ if [ "$(echo ${LB_ARCHITECTURE} | grep ${ARCHITECTURE})" ]
then
VALID="true"
break
@@ -57,13 +57,13 @@ Check_crossarchitecture ()
Check_multiarchitecture ()
{
- if [ "$(echo ${LH_ARCHITECTURE} | wc -w)" -gt "1" ]
+ if [ "$(echo ${LB_ARCHITECTURE} | wc -w)" -gt "1" ]
then
# First, only support multiarch on iso
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
iso*)
# Assemble multi-arch
- case "${LH_CURRENT_ARCHITECTURE}" in
+ case "${LB_CURRENT_ARCHITECTURE}" in
amd64)
DESTDIR="${DESTDIR}.amd"
DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
diff --git a/functions/cache.sh b/functions/cache.sh
index b656512..bae606d 100755
--- a/functions/cache.sh
+++ b/functions/cache.sh
@@ -12,7 +12,7 @@ Restore_cache ()
{
DIRECTORY="${1}"
- if [ "${LH_CACHE}" = "true" ] && [ "${LH_CACHE_PACKAGES}" = "true" ]
+ if [ "${LB_CACHE}" = "true" ] && [ "${LB_CACHE_PACKAGES}" = "true" ]
then
if [ -d "${DIRECTORY}" ]
then
@@ -33,7 +33,7 @@ Save_cache ()
{
DIRECTORY="${1}"
- if [ "${LH_CACHE}" = "true" ] && [ "${LH_CACHE_PACKAGES}" = "true" ]
+ if [ "${LB_CACHE}" = "true" ] && [ "${LB_CACHE_PACKAGES}" = "true" ]
then
# Cleaning current cache
Chroot chroot "apt-get autoclean"
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 77d777a..589200a 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -16,12 +16,12 @@ Chroot ()
# Executing commands in chroot
Echo_debug "Executing: %s" "${COMMANDS}"
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
- ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+ ${LB_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LB_APT_FTP_PROXY}" http_proxy="${LB_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
else
# Building with fakeroot/fakechroot
- ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
+ ${LB_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
fi
return "${?}"
diff --git a/functions/conffile.sh b/functions/conffile.sh
index c08d346..02730df 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -10,13 +10,13 @@
Get_conffiles ()
{
- if [ -n "${LH_CONFIG}" ]
+ if [ -n "${LB_CONFIG}" ]
then
- FILES="${LH_CONFIG}"
+ FILES="${LB_CONFIG}"
else
for FILE in ${@}
do
- FILES="${FILES} ${FILE} ${FILE}.${LH_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
+ FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index c55c8b1..b9b475f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -12,62 +12,62 @@ Set_defaults ()
{
## config/common
- LH_BASE="${LH_BASE:-/usr/share/live/build}"
+ LB_BASE="${LB_BASE:-/usr/share/live/build}"
# Setting mode
- if [ -z "${LH_MODE}" ]
+ if [ -z "${LB_MODE}" ]
then
- LH_MODE="debian"
+ LB_MODE="debian"
fi
# Setting distribution name
- if [ -z "${LH_DISTRIBUTION}" ]
+ if [ -z "${LB_DISTRIBUTION}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_DISTRIBUTION="squeeze"
+ LB_DISTRIBUTION="squeeze"
;;
emdebian)
- LH_DISTRIBUTION="sid"
+ LB_DISTRIBUTION="sid"
;;
ubuntu)
- LH_DISTRIBUTION="karmic"
+ LB_DISTRIBUTION="karmic"
;;
esac
fi
# Setting package manager
- LH_APT="${LH_APT:-apt}"
+ LB_APT="${LB_APT:-apt}"
# Setting apt ftp proxy
- if [ -z "${LH_APT_FTP_PROXY}" ] && [ -n "${ftp_proxy}" ]
+ if [ -z "${LB_APT_FTP_PROXY}" ] && [ -n "${ftp_proxy}" ]
then
- LH_APT_FTP_PROXY="${ftp_proxy}"
+ LB_APT_FTP_PROXY="${ftp_proxy}"
else
- if [ -n "${LH_APT_FTP_PROXY}" ] && [ "${LH_APT_FTP_PROXY}" != "${ftp_proxy}" ]
+ if [ -n "${LB_APT_FTP_PROXY}" ] && [ "${LB_APT_FTP_PROXY}" != "${ftp_proxy}" ]
then
- ftp_proxy="${LH_APT_FTP_PROXY}"
+ ftp_proxy="${LB_APT_FTP_PROXY}"
fi
fi
# Setting apt http proxy
- if [ -z "${LH_APT_HTTP_PROXY}" ] && [ -n "${http_proxy}" ]
+ if [ -z "${LB_APT_HTTP_PROXY}" ] && [ -n "${http_proxy}" ]
then
- LH_APT_HTTP_PROXY="${http_proxy}"
+ LB_APT_HTTP_PROXY="${http_proxy}"
else
- if [ -n "${LH_APT_HTTP_PROXY}" ] && [ "${LH_APT_HTT_PROXY}" != "${http_proxy}" ]
+ if [ -n "${LB_APT_HTTP_PROXY}" ] && [ "${LB_APT_HTT_PROXY}" != "${http_proxy}" ]
then
- http_proxy="${LH_APT_HTTP_PROXY}"
+ http_proxy="${LB_APT_HTTP_PROXY}"
fi
fi
# Setting apt pdiffs
- LH_APT_PDIFFS="${LH_APT_PDIFFS:-true}"
+ LB_APT_PDIFFS="${LB_APT_PDIFFS:-true}"
# Setting apt pipeline
- # LH_APT_PIPELINE
+ # LB_APT_PIPELINE
APT_OPTIONS="${APT_OPTIONS:---yes}"
APTITUDE_OPTIONS="${APTITUDE_OPTIONS:---assume-yes}"
@@ -80,28 +80,28 @@ Set_defaults ()
fi
# Setting apt recommends
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release|ubuntu)
- LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-true}"
+ LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-true}"
;;
emdebian)
- LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-false}"
+ LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}"
;;
esac
# Setting apt secure
- LH_APT_SECURE="${LH_APT_SECURE:-true}"
+ LB_APT_SECURE="${LB_APT_SECURE:-true}"
# Setting bootstrap program
- if [ -z "${LH_BOOTSTRAP}" ] || ( [ ! -x "$(which ${LH_BOOTSTRAP} 2>/dev/null)" ] && [ "${LH_BOOTSTRAP}" != "copy" ] )
+ if [ -z "${LB_BOOTSTRAP}" ] || ( [ ! -x "$(which ${LB_BOOTSTRAP} 2>/dev/null)" ] && [ "${LB_BOOTSTRAP}" != "copy" ] )
then
if [ -x "/usr/sbin/debootstrap" ]
then
- LH_BOOTSTRAP="debootstrap"
+ LB_BOOTSTRAP="debootstrap"
elif [ -x "/usr/bin/cdebootstrap" ]
then
- LH_BOOTSTRAP="cdebootstrap"
+ LB_BOOTSTRAP="cdebootstrap"
else
Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
exit 1
@@ -109,72 +109,72 @@ Set_defaults ()
fi
# Setting cache option
- LH_CACHE="${LH_CACHE:-true}"
- LH_CACHE_INDICES="${LH_CACHE_INDICES:-false}"
- LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-true}"
- LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}"
+ LB_CACHE="${LB_CACHE:-true}"
+ LB_CACHE_INDICES="${LB_CACHE_INDICES:-false}"
+ LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES:-true}"
+ LB_CACHE_STAGES="${LB_CACHE_STAGES:-bootstrap}"
# Setting debconf frontend
- LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND:-noninteractive}"
- LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
- LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}"
+ LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND:-noninteractive}"
+ LB_DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS:-yes}"
+ LB_DEBCONF_PRIORITY="${LB_DEBCONF_PRIORITY:-critical}"
- case "${LH_DEBCONF_NOWARNINGS}" in
+ case "${LB_DEBCONF_NOWARNINGS}" in
true)
- LH_DEBCONF_NOWARNINGS="yes"
+ LB_DEBCONF_NOWARNINGS="yes"
;;
false)
- LH_DEBCONF_NOWARNINGS="no"
+ LB_DEBCONF_NOWARNINGS="no"
;;
esac
# Setting initramfs hook
- if [ -z "${LH_INITRAMFS}" ]
+ if [ -z "${LB_INITRAMFS}" ]
then
- LH_INITRAMFS="auto"
+ LB_INITRAMFS="auto"
else
- if [ "${LH_INITRAMFS}" = "auto" ]
+ if [ "${LB_INITRAMFS}" = "auto" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_INITRAMFS="casper"
+ LB_INITRAMFS="casper"
;;
*)
- LH_INITRAMFS="live-initramfs"
+ LB_INITRAMFS="live-initramfs"
;;
esac
fi
fi
# Setting fdisk
- if [ -z "${LH_FDISK}" ] || [ ! -x "${LH_FDISK}" ]
+ if [ -z "${LB_FDISK}" ] || [ ! -x "${LB_FDISK}" ]
then
# Workaround for gnu-fdisk divertion
# (gnu-fdisk is buggy, #445304).
if [ -x /sbin/fdisk.distrib ]
then
- LH_FDISK="fdisk.distrib"
+ LB_FDISK="fdisk.distrib"
elif [ -x /sbin/fdisk ]
then
- LH_FDISK="fdisk"
+ LB_FDISK="fdisk"
else
Echo_error "Can't process file /sbin/fdisk"
fi
fi
# Setting losetup
- if [ -z "${LH_LOSETUP}" ] || [ "${LH_LOSETUP}" != "/sbin/losetup.orig" ]
+ if [ -z "${LB_LOSETUP}" ] || [ "${LB_LOSETUP}" != "/sbin/losetup.orig" ]
then
# Workaround for loop-aes-utils divertion
# (loop-aes-utils' losetup lacks features).
if [ -x /sbin/losetup.orig ]
then
- LH_LOSETUP="losetup.orig"
+ LB_LOSETUP="losetup.orig"
elif [ -x /sbin/losetup ]
then
- LH_LOSETUP="losetup"
+ LB_LOSETUP="losetup"
else
Echo_error "Can't process file /sbin/losetup"
fi
@@ -183,47 +183,47 @@ Set_defaults ()
if [ "$(id -u)" = "0" ]
then
# If we are root, disable root command
- LH_ROOT_COMMAND=""
+ LB_ROOT_COMMAND=""
else
if [ -x /usr/bin/sudo ]
then
# FIXME: this is false until considered safe
- #LH_ROOT_COMMAND="sudo"
- LH_ROOT_COMMAND=""
+ #LB_ROOT_COMMAND="sudo"
+ LB_ROOT_COMMAND=""
fi
fi
# Setting tasksel
- LH_TASKSEL="${LH_TASKSEL:-tasksel}"
+ LB_TASKSEL="${LB_TASKSEL:-tasksel}"
# Setting root directory
- if [ -z "${LH_ROOT}" ]
+ if [ -z "${LB_ROOT}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_ROOT="debian-live"
+ LB_ROOT="debian-live"
;;
emdebian)
- LH_ROOT="emdebian-live"
+ LB_ROOT="emdebian-live"
;;
ubuntu)
- LH_ROOT="ubuntu-live"
+ LB_ROOT="ubuntu-live"
;;
esac
fi
# Setting includes
- if [ -z "${LH_INCLUDES}" ]
+ if [ -z "${LB_INCLUDES}" ]
then
- LH_INCLUDES="${LH_BASE}/includes"
+ LB_INCLUDES="${LB_BASE}/includes"
fi
# Setting templates
- if [ -z "${LH_TEMPLATES}" ]
+ if [ -z "${LB_TEMPLATES}" ]
then
- LH_TEMPLATES="${LH_BASE}/templates"
+ LB_TEMPLATES="${LB_BASE}/templates"
fi
# Setting live helper options
@@ -237,94 +237,94 @@ Set_defaults ()
## config/bootstrap
# Setting architecture value
- if [ -z "${LH_ARCHITECTURE}" ]
+ if [ -z "${LB_ARCHITECTURE}" ]
then
if [ -x "/usr/bin/dpkg" ]
then
- LH_ARCHITECTURE="$(dpkg --print-architecture)"
+ LB_ARCHITECTURE="$(dpkg --print-architecture)"
else
case "$(uname -m)" in
sparc|powerpc)
- LH_ARCHITECTURE="$(uname -m)"
+ LB_ARCHITECTURE="$(uname -m)"
;;
x86_64)
- LH_ARCHITECTURE="amd64"
+ LB_ARCHITECTURE="amd64"
;;
*)
Echo_warning "Can't determine architecture, assuming i386"
- LH_ARCHITECTURE="i386"
+ LB_ARCHITECTURE="i386"
;;
esac
fi
fi
# Include packages on base
- # LH_BOOTSTRAP_INCLUDE
+ # LB_BOOTSTRAP_INCLUDE
# Exclude packages on base
- # LH_BOOTSTRAP_EXCLUDE
+ # LB_BOOTSTRAP_EXCLUDE
# Setting distribution configuration value
- # LH_BOOTSTRAP_CONFIG
+ # LB_BOOTSTRAP_CONFIG
# Setting flavour value
- case "${LH_BOOTSTRAP}" in
+ case "${LB_BOOTSTRAP}" in
cdebootstrap)
- LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR:-standard}"
+ LB_BOOTSTRAP_FLAVOUR="${LB_BOOTSTRAP_FLAVOUR:-standard}"
;;
esac
# Setting bootstrap keyring
- # LH_BOOTSTRAP_KEYRING
+ # LB_BOOTSTRAP_KEYRING
# Setting mirror to fetch packages from
- if [ -z "${LH_MIRROR_BOOTSTRAP}" ]
+ if [ -z "${LB_MIRROR_BOOTSTRAP}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+ LB_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
;;
emdebian)
- LH_MIRROR_BOOTSTRAP="http://buildd.emdebian.org/grip/"
+ LB_MIRROR_BOOTSTRAP="http://buildd.emdebian.org/grip/"
;;
ubuntu)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
+ LB_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/"
;;
*)
- LH_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
+ LB_MIRROR_BOOTSTRAP="http://ports.ubuntu.com/"
;;
esac
;;
esac
fi
- LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT:-${LH_MIRROR_BOOTSTRAP}}"
+ LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT:-${LB_MIRROR_BOOTSTRAP}}"
# Setting security mirror to fetch packages from
- if [ -z "${LH_MIRROR_CHROOT_SECURITY}" ]
+ if [ -z "${LB_MIRROR_CHROOT_SECURITY}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
+ LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
;;
emdebian)
- LH_MIRROR_CHROOT_SECURITY="none"
+ LB_MIRROR_CHROOT_SECURITY="none"
;;
ubuntu)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_MIRROR_CHROOT_SECURITY="http://security.ubuntu.com/ubuntu/"
+ LB_MIRROR_CHROOT_SECURITY="http://security.ubuntu.com/ubuntu/"
;;
*)
- LH_MIRROR_CHROOT_SECURITY="http://ports.ubuntu.com/"
+ LB_MIRROR_CHROOT_SECURITY="http://ports.ubuntu.com/"
;;
esac
;;
@@ -332,53 +332,53 @@ Set_defaults ()
fi
# Setting volatile mirror to fetch packages from
- if [ -z "${LH_MIRROR_CHROOT_VOLATILE}" ]
+ if [ -z "${LB_MIRROR_CHROOT_VOLATILE}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_MIRROR_CHROOT_VOLATILE="http://volatile.debian.org/debian-volatile/"
+ LB_MIRROR_CHROOT_VOLATILE="http://volatile.debian.org/debian-volatile/"
;;
esac
;;
ubuntu)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_MIRROR_CHROOT_VOLATILE="http://security.ubuntu.com/ubuntu/"
+ LB_MIRROR_CHROOT_VOLATILE="http://security.ubuntu.com/ubuntu/"
;;
*)
- LH_MIRROR_CHROOT_VOLATILE="http://ports.ubuntu.com/"
+ LB_MIRROR_CHROOT_VOLATILE="http://ports.ubuntu.com/"
;;
esac
;;
esac
- LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE:-none}"
+ LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}"
fi
# Setting mirror which ends up in the image
- if [ -z "${LH_MIRROR_BINARY}" ]
+ if [ -z "${LB_MIRROR_BINARY}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_MIRROR_BINARY="http://cdn.debian.net/debian/"
+ LB_MIRROR_BINARY="http://cdn.debian.net/debian/"
;;
emdebian)
- LH_MIRROR_BINARY="http://buildd.emdebian.org/grip/"
+ LB_MIRROR_BINARY="http://buildd.emdebian.org/grip/"
;;
ubuntu)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
+ LB_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/"
;;
*)
- LH_MIRROR_BINARY="http://ports.ubuntu.com/"
+ LB_MIRROR_BINARY="http://ports.ubuntu.com/"
;;
esac
;;
@@ -386,25 +386,25 @@ Set_defaults ()
fi
# Setting security mirror which ends up in the image
- if [ -z "${LH_MIRROR_BINARY_SECURITY}" ]
+ if [ -z "${LB_MIRROR_BINARY_SECURITY}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+ LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
;;
emdebian)
- LH_MIRROR_BINARY_SECURITY="none"
+ LB_MIRROR_BINARY_SECURITY="none"
;;
ubuntu)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_MIRROR_BINARY_SECURITY="http://archive.ubuntu.com/ubuntu/"
+ LB_MIRROR_BINARY_SECURITY="http://archive.ubuntu.com/ubuntu/"
;;
*)
- LH_MIRROR_BINARY_SECURITY="http://ports.ubuntu.com/"
+ LB_MIRROR_BINARY_SECURITY="http://ports.ubuntu.com/"
;;
esac
;;
@@ -412,45 +412,45 @@ Set_defaults ()
fi
# Setting volatile mirror which ends up in the image
- if [ -z "${LH_MIRROR_BINARY_VOLATILE}" ]
+ if [ -z "${LB_MIRROR_BINARY_VOLATILE}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_MIRROR_BINARY_VOLATILE="http://volatile.debian.org/debian-volatile/"
+ LB_MIRROR_BINARY_VOLATILE="http://volatile.debian.org/debian-volatile/"
;;
esac
;;
ubuntu)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_MIRROR_BINARY_VOLATILE="http://security.ubuntu.com/ubuntu/"
+ LB_MIRROR_BINARY_VOLATILE="http://security.ubuntu.com/ubuntu/"
;;
*)
- LH_MIRROR_BINARY_VOLATILE="http://ports.ubuntu.com/"
+ LB_MIRROR_BINARY_VOLATILE="http://ports.ubuntu.com/"
;;
esac
;;
esac
- LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE:-none}"
+ LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-none}"
fi
- LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER:-${LH_MIRROR_BOOTSTRAP}}"
+ LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}"
# Setting archive areas value
- if [ -z "${LH_ARCHIVE_AREAS}" ]
+ if [ -z "${LB_ARCHIVE_AREAS}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_ARCHIVE_AREAS="main restricted"
+ LB_ARCHIVE_AREAS="main restricted"
;;
*)
- LH_ARCHIVE_AREAS="main"
+ LB_ARCHIVE_AREAS="main"
;;
esac
fi
@@ -458,44 +458,44 @@ Set_defaults ()
## config/chroot
# Setting chroot filesystem
- LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM:-squashfs}"
+ LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM:-squashfs}"
# Setting virtual root size
- LH_VIRTUAL_ROOT_SIZE="${LH_VIRTUAL_ROOT_SIZE:-10000}"
+ LB_VIRTUAL_ROOT_SIZE="${LB_VIRTUAL_ROOT_SIZE:-10000}"
# Setting whether to expose root filesystem as read only
- LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT:-false}"
+ LB_EXPOSED_ROOT="${LB_EXPOSED_ROOT:-false}"
# Setting union filesystem
- LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM:-aufs}"
+ LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}"
- # LH_HOOKS
+ # LB_HOOKS
# Setting interactive shell/X11/Xnest
- LH_INTERACTIVE="${LH_INTERACTIVE:-false}"
+ LB_INTERACTIVE="${LB_INTERACTIVE:-false}"
# Setting keyring packages
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES:-debian-archive-keyring}"
+ LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
;;
emdebian)
- LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES:-debian-archive-keyring}"
+ LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
;;
ubuntu)
- LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES:-ubuntu-keyring}"
+ LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}"
;;
esac
# Setting language string
- LH_LANGUAGE="${LH_LANGUAGE:-en}"
+ LB_LANGUAGE="${LB_LANGUAGE:-en}"
# Setting linux flavour string
- if [ -z "${LH_LINUX_FLAVOURS}" ]
+ if [ -z "${LB_LINUX_FLAVOURS}" ]
then
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
arm|armel)
Echo_error "There is no default kernel flavour defined for your architecture."
Echo_error "Please configure it manually with 'lb config -k FLAVOUR'."
@@ -503,56 +503,56 @@ Set_defaults ()
;;
alpha)
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- Echo_error "Architecture ${LH_ARCHITECTURE} not supported on Ubuntu."
+ Echo_error "Architecture ${LB_ARCHITECTURE} not supported on Ubuntu."
exit 1
;;
*)
- LH_LINUX_FLAVOURS="alpha-generic"
+ LB_LINUX_FLAVOURS="alpha-generic"
;;
esac
;;
amd64)
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_LINUX_FLAVOURS="generic"
+ LB_LINUX_FLAVOURS="generic"
;;
*)
- LH_LINUX_FLAVOURS="amd64"
+ LB_LINUX_FLAVOURS="amd64"
;;
esac
;;
hppa)
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_LINUX_FLAVOURS="hppa32 hppa64"
+ LB_LINUX_FLAVOURS="hppa32 hppa64"
;;
*)
- LH_LINUX_FLAVOURS="parisc"
+ LB_LINUX_FLAVOURS="parisc"
;;
esac
;;
i386)
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_LINUX_FLAVOURS="generic"
+ LB_LINUX_FLAVOURS="generic"
;;
*)
case "${LIST}" in
stripped|minimal)
- LH_LINUX_FLAVOURS="486"
+ LB_LINUX_FLAVOURS="486"
;;
*)
- LH_LINUX_FLAVOURS="486 686"
+ LB_LINUX_FLAVOURS="486 686"
;;
esac
;;
@@ -560,547 +560,547 @@ Set_defaults ()
;;
ia64)
- LH_LINUX_FLAVOURS="itanium"
+ LB_LINUX_FLAVOURS="itanium"
;;
powerpc)
case "${LIST}" in
stripped|minimal)
- LH_LINUX_FLAVOURS="powerpc"
+ LB_LINUX_FLAVOURS="powerpc"
;;
*)
- LH_LINUX_FLAVOURS="powerpc powerpc64"
+ LB_LINUX_FLAVOURS="powerpc powerpc64"
;;
esac
;;
s390)
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- Echo_error "Architecture ${LH_ARCHITECTURE} not supported on Ubuntu."
+ Echo_error "Architecture ${LB_ARCHITECTURE} not supported on Ubuntu."
exit 1
;;
*)
- LH_LINUX_FLAVOURS="s390"
+ LB_LINUX_FLAVOURS="s390"
;;
esac
;;
sparc)
- LH_LINUX_FLAVOURS="sparc64"
+ LB_LINUX_FLAVOURS="sparc64"
;;
*)
- Echo_error "Architecture ${LH_ARCHITECTURE} not yet supported (FIXME)"
+ Echo_error "Architecture ${LB_ARCHITECTURE} not yet supported (FIXME)"
exit 1
;;
esac
fi
# Set linux packages
- if [ -z "${LH_LINUX_PACKAGES}" ]
+ if [ -z "${LB_LINUX_PACKAGES}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release|embedian)
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_LINUX_PACKAGES="linux-image-2.6 \${LH_UNION_FILESYSTEM}-modules-2.6"
+ LB_LINUX_PACKAGES="linux-image-2.6 \${LB_UNION_FILESYSTEM}-modules-2.6"
;;
*)
- LH_LINUX_PACKAGES="linux-image-2.6"
+ LB_LINUX_PACKAGES="linux-image-2.6"
;;
esac
- if [ "${LH_CHROOT_FILESYSTEM}" = "squashfs" ]
+ if [ "${LB_CHROOT_FILESYSTEM}" = "squashfs" ]
then
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} squashfs-modules-2.6"
+ LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES} squashfs-modules-2.6"
;;
esac
fi
- case "${LH_ENCRYPTION}" in
+ case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6"
+ LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES} loop-aes-modules-2.6"
;;
esac
;;
ubuntu)
- LH_LINUX_PACKAGES="linux"
+ LB_LINUX_PACKAGES="linux"
;;
esac
fi
# Setting packages string
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_PACKAGES="${LH_PACKAGES:-ubuntu-minimal}"
+ LB_PACKAGES="${LB_PACKAGES:-ubuntu-minimal}"
;;
*)
- LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS:-standard}"
+ LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS:-standard}"
;;
esac
- case "${LH_ENCRYPTION}" in
+ case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- if ! In_list loop-aes-utils "${LH_PACKAGES}"
+ if ! In_list loop-aes-utils "${LB_PACKAGES}"
then
- LH_PACKAGES="${LH_PACKAGES} loop-aes-utils"
+ LB_PACKAGES="${LB_PACKAGES} loop-aes-utils"
fi
;;
esac
# Setting tasks string
- for LIST in ${LH_PACKAGES_LISTS}
+ for LIST in ${LB_PACKAGES_LISTS}
do
case "${LIST}" in
stripped|minimal)
- LH_APT="apt-get"
+ LB_APT="apt-get"
;;
gnome-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|gnome-desktop||') standard-x11"
- case "${LH_DISTRIBUTION}" in
+ LB_PACKAGES_LISTS="$(echo ${LB_PACKAGES_LISTS} | sed -e 's|gnome-desktop||') standard-x11"
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop"
;;
*)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
;;
esac
;;
kde-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|kde-desktop||') standard-x11"
+ LB_PACKAGES_LISTS="$(echo ${LB_PACKAGES_LISTS} | sed -e 's|kde-desktop||') standard-x11"
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop"
;;
*)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
esac
;;
lxde-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|lxde-desktop||') standard-x11"
+ LB_PACKAGES_LISTS="$(echo ${LB_PACKAGES_LISTS} | sed -e 's|lxde-desktop||') standard-x11"
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop"
;;
*)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
;;
esac
;;
xfce-desktop)
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|xfce-desktop||') standard-x11"
+ LB_PACKAGES_LISTS="$(echo ${LB_PACKAGES_LISTS} | sed -e 's|xfce-desktop||') standard-x11"
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop"
;;
*)
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
;;
esac
;;
esac
done
- LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's| ||g')"
- LH_TASKS="$(echo ${LH_TASKS} | sed -e 's| ||g')"
+ LB_PACKAGES_LISTS="$(echo ${LB_PACKAGES_LISTS} | sed -e 's| ||g')"
+ LB_TASKS="$(echo ${LB_TASKS} | sed -e 's| ||g')"
# Setting security updates option
- if [ "${LH_MIRROR_CHROOT_SECURITY}" = "none" ] || [ "${LH_MIRROR_BINARY_SECURITY}" = "none" ]
+ if [ "${LB_MIRROR_CHROOT_SECURITY}" = "none" ] || [ "${LB_MIRROR_BINARY_SECURITY}" = "none" ]
then
- LH_SECURITY="false"
+ LB_SECURITY="false"
fi
- LH_SECURITY="${LH_SECURITY:-true}"
+ LB_SECURITY="${LB_SECURITY:-true}"
# Setting volatile updates option
- if [ "${LH_MIRROR_CHROOT_VOLATILE}" = "none" ] || [ "${LH_MIRROR_BINARY_VOLATILE}" = "none" ]
+ if [ "${LB_MIRROR_CHROOT_VOLATILE}" = "none" ] || [ "${LB_MIRROR_BINARY_VOLATILE}" = "none" ]
then
- LH_VOLATILE="false"
+ LB_VOLATILE="false"
fi
- LH_VOLATILE="${LH_VOLATILE:-true}"
+ LB_VOLATILE="${LB_VOLATILE:-true}"
# Setting symlink convertion option
- LH_SYMLINKS="${LH_SYMLINKS:-false}"
+ LB_SYMLINKS="${LB_SYMLINKS:-false}"
# Setting sysvinit option
- LH_SYSVINIT="${LH_SYSVINIT:-false}"
+ LB_SYSVINIT="${LB_SYSVINIT:-false}"
## config/binary
# Setting image filesystem
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
sparc)
- LH_BINARY_FILESYSTEM="${LH_BINARY_FILESYSTEM:-ext2}"
+ LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext2}"
;;
*)
- LH_BINARY_FILESYSTEM="${LH_BINARY_FILESYSTEM:-fat16}"
+ LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-fat16}"
;;
esac
# Setting image type
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
squeeze|sid)
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso-hybrid}"
+ LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso-hybrid}"
;;
*)
- LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+ LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso}"
;;
esac
;;
*)
- LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+ LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso}"
;;
esac
# Setting apt indices
- if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
+ if echo ${LB_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
then
- LH_BINARY_INDICES="${LH_BINARY_INDICES:-none}"
+ LB_BINARY_INDICES="${LB_BINARY_INDICES:-none}"
else
- LH_BINARY_INDICES="${LH_BINARY_INDICES:-true}"
+ LB_BINARY_INDICES="${LB_BINARY_INDICES:-true}"
fi
# Setting bootloader
- if [ -z "${LH_BOOTLOADER}" ]
+ if [ -z "${LB_BOOTLOADER}" ]
then
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- LH_BOOTLOADER="syslinux"
+ LB_BOOTLOADER="syslinux"
;;
powerpc)
- LH_BOOTLOADER="yaboot"
+ LB_BOOTLOADER="yaboot"
;;
sparc)
- LH_BOOTLOADER="silo"
+ LB_BOOTLOADER="silo"
;;
esac
fi
# Setting checksums
- LH_CHECKSUMS="${LH_CHECKSUMS:-md5}"
+ LB_CHECKSUMS="${LB_CHECKSUMS:-md5}"
# Setting chroot option
- LH_BUILD_WITH_CHROOT="${LH_BUILD_WITH_CHROOT:-true}"
+ LB_BUILD_WITH_CHROOT="${LB_BUILD_WITH_CHROOT:-true}"
# Setting debian-installer option
- LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-false}"
+ LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-false}"
# Setting debian-installer distribution
- LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION:-${LH_DISTRIBUTION}}"
+ LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}"
# Setting debian-installer-gui
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian)
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
squeeze|sid)
- LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-false}"
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-false}"
;;
*)
- LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-true}"
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
;;
esac
;;
ubuntu)
- case "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" in
+ case "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" in
karmic)
# Not available for Karmic currently.
- LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-false}"
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-false}"
;;
*)
- LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-true}"
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
;;
esac
;;
*)
- LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI:-false}"
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-false}"
;;
esac
# Setting debian-installer preseed filename
- if [ -z "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ]
+ if [ -z "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then
if Find_files config/binary_debian-installer/preseed.cfg
then
- LH_DEBIAN_INSTALLER_PRESEEDFILE="/preseed.cfg"
+ LB_DEBIAN_INSTALLER_PRESEEDFILE="/preseed.cfg"
fi
if Find_files config/binary_debian-installer/*.cfg && [ ! -e config/binary_debian-installer/preseed.cfg ]
then
- Echo_warning "You have placed some preseeding files into config/binary_debian-installer but you didn't specify the default preseeding file through LH_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not take up a preseeding file by default."
+ Echo_warning "You have placed some preseeding files into config/binary_debian-installer but you didn't specify the default preseeding file through LB_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not take up a preseeding file by default."
fi
fi
# Setting boot parameters
- # LH_BOOTAPPEND_LIVE
- if [ -n "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ]
+ # LB_BOOTAPPEND_LIVE
+ if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
iso*)
- _LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
usb*)
- if [ "${LH_MODE}" = "ubuntu" ] || [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
- _LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
else
- _LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
fi
;;
net)
- case "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" in
+ case "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" in
*://*)
- _LH_BOOTAPPEND_PRESEED="file=${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LB_BOOTAPPEND_PRESEED="file=${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
*)
- _LH_BOOTAPPEND_PRESEED="file=/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LB_BOOTAPPEND_PRESEED="file=/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
esac
;;
esac
fi
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
iso-hybrid|usb*)
# Try USB block devices for install media
- if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb
+ if ! echo "${LB_BOOTAPPEND_INSTALL}" | grep -q try-usb
then
- LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+ LB_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LB_BOOTAPPEND_INSTALL}"
fi
;;
esac
- if [ -n ${_LH_BOOTAPPEND_PRESEED} ]
+ if [ -n ${_LB_BOOTAPPEND_PRESEED} ]
then
- LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} ${_LH_BOOTAPPEND_PRESEED}"
+ LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL} ${_LB_BOOTAPPEND_PRESEED}"
fi
- LH_BOOTAPPEND_INSTALL="$(echo ${LH_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')"
+ LB_BOOTAPPEND_INSTALL="$(echo ${LB_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')"
# Setting encryption
- LH_ENCRYPTION="${LH_ENCRYPTION:-false}"
+ LB_ENCRYPTION="${LB_ENCRYPTION:-false}"
# Setting grub splash
- # LH_GRUB_SPLASH
+ # LB_GRUB_SPLASH
# Setting hostname
- if [ -z "${LH_HOSTNAME}" ]
+ if [ -z "${LB_HOSTNAME}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
embedian)
- LH_HOSTNAME="embedian"
+ LB_HOSTNAME="embedian"
;;
ubuntu)
- LH_HOSTNAME="ubuntu"
+ LB_HOSTNAME="ubuntu"
;;
*)
- LH_HOSTNAME="debian"
+ LB_HOSTNAME="debian"
;;
esac
fi
# Setting iso author
- if [ -z "${LH_ISO_APPLICATION}" ]
+ if [ -z "${LB_ISO_APPLICATION}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_ISO_APPLICATION="Debian Live"
+ LB_ISO_APPLICATION="Debian Live"
;;
emdebian)
- LH_ISO_APPLICATION="Emdebian Live"
+ LB_ISO_APPLICATION="Emdebian Live"
;;
ubuntu)
- LH_ISO_APPLICATION="Ubuntu Live"
+ LB_ISO_APPLICATION="Ubuntu Live"
;;
esac
fi
# Set iso preparer
- LH_ISO_PREPARER="${LH_ISO_PREPARER:-live-build \$VERSION; http://packages.qa.debian.org/live-build}"
+ LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; http://packages.qa.debian.org/live-build}"
# Set iso publisher
- LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER:-Debian Live project; http://live.debian.net/; debian-live at lists.debian.org}"
+ LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Debian Live project; http://live.debian.net/; debian-live at lists.debian.org}"
# Setting iso volume
- if [ -z "${LH_ISO_VOLUME}" ]
+ if [ -z "${LB_ISO_VOLUME}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian)
- LH_ISO_VOLUME="Debian ${LH_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)"
+ LB_ISO_VOLUME="Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)"
;;
debian-release)
- eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
- LH_ISO_VOLUME="Debian ${VERSION} ${LH_ARCHITECTURE} live"
+ eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
+ LB_ISO_VOLUME="Debian ${VERSION} ${LB_ARCHITECTURE} live"
;;
emdebian)
- LH_ISO_VOLUME="Emdebian ${LH_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)"
+ LB_ISO_VOLUME="Emdebian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)"
;;
ubuntu)
- LH_ISO_VOLUME="Ubuntu ${LH_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)"
+ LB_ISO_VOLUME="Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)"
;;
esac
fi
# Setting memtest option
- LH_MEMTEST="${LH_MEMTEST:-memtest86+}"
+ LB_MEMTEST="${LB_MEMTEST:-memtest86+}"
# Setting win32-loader option
- if [ "${LH_MODE}" != "ubuntu" ]
+ if [ "${LB_MODE}" != "ubuntu" ]
then
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+ if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
- LH_WIN32_LOADER="${LH_WIN32_LOADER:-true}"
+ LB_WIN32_LOADER="${LB_WIN32_LOADER:-true}"
else
- LH_WIN32_LOADER="${LH_WIN32_LOADER:-false}"
+ LB_WIN32_LOADER="${LB_WIN32_LOADER:-false}"
fi
;;
*)
- LH_WIN32_LOADER="${LH_WIN32_LOADER:-false}"
+ LB_WIN32_LOADER="${LB_WIN32_LOADER:-false}"
;;
esac
fi
# Setting netboot filesystem
- LH_NET_ROOT_FILESYSTEM="${LH_NET_ROOT_FILESYSTEM:-nfs}"
+ LB_NET_ROOT_FILESYSTEM="${LB_NET_ROOT_FILESYSTEM:-nfs}"
# Setting netboot server path
- if [ -z "${LH_NET_ROOT_PATH}" ]
+ if [ -z "${LB_NET_ROOT_PATH}" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_NET_ROOT_PATH="/srv/debian-live"
+ LB_NET_ROOT_PATH="/srv/debian-live"
;;
emdebian)
- LH_NET_ROOT_PATH="/srv/emdebian-live"
+ LB_NET_ROOT_PATH="/srv/emdebian-live"
;;
ubuntu)
- LH_NET_ROOT_PATH="/srv/ubuntu-live"
+ LB_NET_ROOT_PATH="/srv/ubuntu-live"
;;
esac
fi
# Setting netboot server address
- LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER:-192.168.1.1}"
+ LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER:-192.168.1.1}"
# Setting net cow filesystem
- LH_NET_COW_FILESYSTEM="${LH_NET_COW_FILESYSTEM:-nfs}"
+ LB_NET_COW_FILESYSTEM="${LB_NET_COW_FILESYSTEM:-nfs}"
# Setting net tarball
- LH_NET_TARBALL="${LH_NET_TARBALL:-gzip}"
+ LB_NET_TARBALL="${LB_NET_TARBALL:-gzip}"
# Setting syslinux configuration file
- # LH_SYSLINUX_CFG
+ # LB_SYSLINUX_CFG
# Setting syslinux splash
- # LH_SYSLINUX_SPLASH
+ # LB_SYSLINUX_SPLASH
- LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}"
+ LB_SYSLINUX_TIMEOUT="${LB_SYSLINUX_TIMEOUT:-0}"
# Setting syslinux menu
- LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-true}"
+ LB_SYSLINUX_MENU="${LB_SYSLINUX_MENU:-true}"
# Setting syslinux menu live entries
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Live}"
- LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
+ LB_SYSLINUX_MENU_LIVE_ENTRY="${LB_SYSLINUX_MENU_LIVE_ENTRY:-Live}"
+ LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LB_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
;;
*)
- LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}"
- LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
+ LB_SYSLINUX_MENU_LIVE_ENTRY="${LB_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LB_ISO_APPLICATION}}"
+ LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LB_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LB_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
;;
esac
# Settings memtest menu entry
- LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY:-Memory test}"
+ LB_SYSLINUX_MENU_MEMTEST_ENTRY="${LB_SYSLINUX_MENU_MEMTEST_ENTRY:-Memory test}"
# Setting username
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- LH_USERNAME="${LH_USERNAME:-ubuntu}"
+ LB_USERNAME="${LB_USERNAME:-ubuntu}"
;;
*)
- LH_USERNAME="${LH_USERNAME:-user}"
+ LB_USERNAME="${LB_USERNAME:-user}"
;;
esac
## config/source
# Setting source option
- LH_SOURCE="${LH_SOURCE:-false}"
+ LB_SOURCE="${LB_SOURCE:-false}"
# Setting image type
- LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES:-tar}"
+ LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
# Setting fakeroot/fakechroot
- LH_USE_FAKEROOT="${LH_USE_FAKEROOT:-false}"
+ LB_USE_FAKEROOT="${LB_USE_FAKEROOT:-false}"
}
Check_defaults ()
{
- if [ "${LH_CONFIG_VERSION}" ]
+ if [ "${LB_CONFIG_VERSION}" ]
then
# We're only checking when we're actually running the checks
# that's why the check for emptyness of the version;
- # however, as live-build always declares LH_CONFIG_VERSION
+ # however, as live-build always declares LB_CONFIG_VERSION
# internally, this is safe assumption (no cases where it's unset,
# except when bootstrapping the functions/defaults etc.).
- CURRENT_CONFIG_VERSION="$(echo ${LH_CONFIG_VERSION} | awk -F. '{ print $1 }')"
+ CURRENT_CONFIG_VERSION="$(echo ${LB_CONFIG_VERSION} | awk -F. '{ print $1 }')"
if [ ${CURRENT_CONFIG_VERSION} -ge 3 ]
then
@@ -1120,40 +1120,40 @@ Check_defaults ()
fi
fi
- if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
+ if echo ${LB_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
then
# aptitude + stripped|minimal
- if [ "${LH_APT}" = "aptitude" ]
+ if [ "${LB_APT}" = "aptitude" ]
then
- Echo_warning "You selected LH_PACKAGES_LISTS='%s' and LH_APT='aptitude'" "${LH_PACKAGES_LIST}. This configuration is potentially unsafe, as aptitude is not used in the stripped/minimal package lists."
+ Echo_warning "You selected LB_PACKAGES_LISTS='%s' and LB_APT='aptitude'" "${LB_PACKAGES_LIST}. This configuration is potentially unsafe, as aptitude is not used in the stripped/minimal package lists."
fi
fi
- if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+ if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
# d-i true, no caching
- if ! echo ${LH_CACHE_STAGES} | grep -qs "bootstrap\b" || [ "${LH_CACHE}" != "true" ] || [ "${LH_CACHE_PACKAGES}" != "true" ]
+ if ! echo ${LB_CACHE_STAGES} | grep -qs "bootstrap\b" || [ "${LB_CACHE}" != "true" ] || [ "${LB_CACHE_PACKAGES}" != "true" ]
then
- Echo_warning "You have selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached. This configuration is potentially unsafe as the bootstrap packages are re-used when integrating the Debian Installer."
+ Echo_warning "You have selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached. This configuration is potentially unsafe as the bootstrap packages are re-used when integrating the Debian Installer."
fi
fi
- if [ "${LH_BOOTLOADER}" = "syslinux" ]
+ if [ "${LB_BOOTLOADER}" = "syslinux" ]
then
# syslinux + fat
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
fat*)
;;
*)
- Echo_warning "You have selected values of LH_BOOTLOADER and LH_BINARY_FILESYSTEM which are incompatible - syslinux only supports FAT filesystems."
+ Echo_warning "You have selected values of LB_BOOTLOADER and LB_BINARY_FILESYSTEM which are incompatible - syslinux only supports FAT filesystems."
;;
esac
fi
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
usb*)
# grub or yaboot + usb
- case "${LH_BOOTLOADER}" in
+ case "${LB_BOOTLOADER}" in
grub|yaboot)
Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type."
exit 1
@@ -1162,31 +1162,31 @@ Check_defaults ()
;;
esac
- if [ "$(echo ${LH_ISO_APPLICATION} | wc -c)" -gt 128 ]
+ if [ "$(echo ${LB_ISO_APPLICATION} | wc -c)" -gt 128 ]
then
- Echo_warning "You have specified a value of LH_ISO_APPLICATION that is too long; the maximum length is 128 characters."
+ Echo_warning "You have specified a value of LB_ISO_APPLICATION that is too long; the maximum length is 128 characters."
fi
- if [ "$(echo ${LH_ISO_PREPARER} | wc -c)" -gt 128 ]
+ if [ "$(echo ${LB_ISO_PREPARER} | wc -c)" -gt 128 ]
then
- Echo_warning "You have specified a value of LH_ISO_PREPARER that is too long; the maximum length is 128 characters."
+ Echo_warning "You have specified a value of LB_ISO_PREPARER that is too long; the maximum length is 128 characters."
fi
- if [ "$(echo ${LH_ISO_PUBLISHER} | wc -c)" -gt 128 ]
+ if [ "$(echo ${LB_ISO_PUBLISHER} | wc -c)" -gt 128 ]
then
- Echo_warning "You have specified a value of LH_ISO_PUBLISHER that is too long; the maximum length is 128 characters."
+ Echo_warning "You have specified a value of LB_ISO_PUBLISHER that is too long; the maximum length is 128 characters."
fi
- if [ "$(eval "echo ${LH_ISO_VOLUME}" | wc -c)" -gt 32 ]
+ if [ "$(eval "echo ${LB_ISO_VOLUME}" | wc -c)" -gt 32 ]
then
- Echo_warning "You have specified a value of LH_ISO_VOLUME that is too long; the maximum length is 32 characters."
+ Echo_warning "You have specified a value of LB_ISO_VOLUME that is too long; the maximum length is 32 characters."
fi
- if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
+ if echo ${LB_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
then
- if [ "${LH_BINARY_INDICES}" = "true" ]
+ if [ "${LB_BINARY_INDICES}" = "true" ]
then
- Echo_warning "You have selected hook to minimise image size but you are still including package indices with your value of LH_BINARY_INDICES."
+ Echo_warning "You have selected hook to minimise image size but you are still including package indices with your value of LB_BINARY_INDICES."
fi
fi
diff --git a/functions/echo.sh b/functions/echo.sh
index 0d8147a..555bc42 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -238,7 +238,7 @@ Echo_file ()
Echo_breakage ()
{
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
sid|unstable)
Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution."
;;
diff --git a/functions/losetup.sh b/functions/losetup.sh
index cb9eeed..fa6cd83 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -14,9 +14,9 @@ Losetup ()
FILE="${2}"
PARTITION="${3:-1}"
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
- FDISK_OUT="$(${LH_FDISK} -l -u ${DEVICE} 2>&1)"
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
+ ${LB_ROOT_COMMAND} ${LB_LOSETUP} "${DEVICE}" "${FILE}"
+ FDISK_OUT="$(${LB_FDISK} -l -u ${DEVICE} 2>&1)"
+ ${LB_ROOT_COMMAND} ${LB_LOSETUP} -d "${DEVICE}"
LOOPDEVICE="$(echo ${DEVICE}p${PARTITION})"
@@ -24,14 +24,14 @@ Losetup ()
then
Echo_message "Mounting %s with offset 0" "${DEVICE}"
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
+ ${LB_ROOT_COMMAND} ${LB_LOSETUP} "${DEVICE}" "${FILE}"
else
SECTORS="$(echo "$FDISK_OUT" | sed -ne "s|^$LOOPDEVICE[ *]*\([0-9]*\).*|\1|p")"
OFFSET="$(expr ${SECTORS} '*' 512)"
Echo_message "Mounting %s with offset %s" "${DEVICE}" "${OFFSET}"
- ${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
+ ${LB_ROOT_COMMAND} ${LB_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
fi
}
diff --git a/functions/packages.sh b/functions/packages.sh
index 8d79532..20d53df 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -17,7 +17,7 @@ Check_package ()
case "${INSTALL_STATUS}" in
1)
- _LH_PACKAGES="${_LH_PACKAGES} ${PACKAGE}"
+ _LB_PACKAGES="${_LB_PACKAGES} ${PACKAGE}"
;;
2)
@@ -29,15 +29,15 @@ Check_package ()
Install_package ()
{
- if [ -n "${_LH_PACKAGES}" ] && [ "${LH_BUILD_WITH_CHROOT}" != "false" ]
+ if [ -n "${_LB_PACKAGES}" ] && [ "${LB_BUILD_WITH_CHROOT}" != "false" ]
then
- case "${LH_APT}" in
+ case "${LB_APT}" in
apt|apt-get)
- Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "apt-get install -o APT::Install-Recommends=false ${APT_OPTIONS} ${_LB_PACKAGES}"
;;
aptitude)
- Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LB_PACKAGES}"
;;
esac
fi
@@ -45,15 +45,15 @@ Install_package ()
Remove_package ()
{
- if [ -n "${_LH_PACKAGES}" ] && [ "${LH_BUILD_WITH_CHROOT}" != "false" ]
+ if [ -n "${_LB_PACKAGES}" ] && [ "${LB_BUILD_WITH_CHROOT}" != "false" ]
then
- case "${LH_APT}" in
+ case "${LB_APT}" in
apt|apt-get)
- Chroot chroot "apt-get remove --purge ${APT_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "apt-get remove --purge ${APT_OPTIONS} ${_LB_PACKAGES}"
;;
aptitude)
- Chroot chroot "aptitude purge ${APTITUDE_OPTIONS} ${_LH_PACKAGES}"
+ Chroot chroot "aptitude purge ${APTITUDE_OPTIONS} ${_LB_PACKAGES}"
;;
esac
fi
@@ -69,7 +69,7 @@ Check_installed ()
FILE="${1}"
PACKAGE="${2}"
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
then
diff --git a/functions/packageslists.sh b/functions/packageslists.sh
index 6510d27..6095f3f 100755
--- a/functions/packageslists.sh
+++ b/functions/packageslists.sh
@@ -10,89 +10,89 @@
Expand_packagelist ()
{
- _LH_EXPAND_QUEUE="$(basename "${1}")"
+ _LB_EXPAND_QUEUE="$(basename "${1}")"
shift
- while [ -n "${_LH_EXPAND_QUEUE}" ]
+ while [ -n "${_LB_EXPAND_QUEUE}" ]
do
- _LH_LIST_NAME="$(echo ${_LH_EXPAND_QUEUE} | cut -d" " -f1)"
- _LH_EXPAND_QUEUE="$(echo ${_LH_EXPAND_QUEUE} | cut -s -d" " -f2-)"
- _LH_LIST_LOCATION=""
- _LH_NESTED=0
- _LH_ENABLED=1
+ _LB_LIST_NAME="$(echo ${_LB_EXPAND_QUEUE} | cut -d" " -f1)"
+ _LB_EXPAND_QUEUE="$(echo ${_LB_EXPAND_QUEUE} | cut -s -d" " -f2-)"
+ _LB_LIST_LOCATION=""
+ _LB_NESTED=0
+ _LB_ENABLED=1
- for _LH_SEARCH_PATH in ${@} "${LH_BASE:-/usr/share/live/build}/lists"
+ for _LB_SEARCH_PATH in ${@} "${LB_BASE:-/usr/share/live/build}/lists"
do
- if [ -e "${_LH_SEARCH_PATH}/${_LH_LIST_NAME}" ]
+ if [ -e "${_LB_SEARCH_PATH}/${_LB_LIST_NAME}" ]
then
- _LH_LIST_LOCATION="${_LH_SEARCH_PATH}/${_LH_LIST_NAME}"
+ _LB_LIST_LOCATION="${_LB_SEARCH_PATH}/${_LB_LIST_NAME}"
break
fi
done
- if [ -z "${_LH_LIST_LOCATION}" ]
+ if [ -z "${_LB_LIST_LOCATION}" ]
then
- echo "W: Unknown package list '${_LH_LIST_NAME}'" >&2
+ echo "W: Unknown package list '${_LB_LIST_NAME}'" >&2
continue
fi
- while read _LH_LINE
+ while read _LB_LINE
do
- case "${_LH_LINE}" in
+ case "${_LB_LINE}" in
\#if\ *)
- if [ ${_LH_NESTED} -eq 1 ]
+ if [ ${_LB_NESTED} -eq 1 ]
then
echo "E: Nesting conditionals is not supported" >&2
exit 1
fi
- _LH_NESTED=1
+ _LB_NESTED=1
- _LH_NEEDLE="$(echo "${_LH_LINE}" | cut -d' ' -f3-)"
- _LH_HAYSTACK="$(eval "echo \$LH_$(echo "${_LH_LINE}" | cut -d' ' -f2)")"
+ _LB_NEEDLE="$(echo "${_LB_LINE}" | cut -d' ' -f3-)"
+ _LB_HAYSTACK="$(eval "echo \$LB_$(echo "${_LB_LINE}" | cut -d' ' -f2)")"
- _LH_ENABLED=0
- for _LH_NEEDLE_PART in ${_LH_NEEDLE}
+ _LB_ENABLED=0
+ for _LB_NEEDLE_PART in ${_LB_NEEDLE}
do
- for _LH_HAYSTACK_PART in ${_LH_HAYSTACK}
+ for _LB_HAYSTACK_PART in ${_LB_HAYSTACK}
do
- if [ "${_LH_NEEDLE_PART}" = "${_LH_HAYSTACK_PART}" ]
+ if [ "${_LB_NEEDLE_PART}" = "${_LB_HAYSTACK_PART}" ]
then
- _LH_ENABLED=1
+ _LB_ENABLED=1
fi
done
done
;;
\#endif*)
- _LH_NESTED=0
- _LH_ENABLED=1
+ _LB_NESTED=0
+ _LB_ENABLED=1
;;
\#*)
- if [ ${_LH_ENABLED} -ne 1 ]
+ if [ ${_LB_ENABLED} -ne 1 ]
then
continue
fi
# Find includes
- _LH_INCLUDES="$(echo "${_LH_LINE}" | sed -n \
+ _LB_INCLUDES="$(echo "${_LB_LINE}" | sed -n \
-e 's|^#<include> \([^ ]*\)|\1|gp' \
-e 's|^#include <\([^ ]*\)>|\1|gp')"
# Add to queue
- _LH_EXPAND_QUEUE="$(echo ${_LH_EXPAND_QUEUE} ${_LH_INCLUDES} |
+ _LB_EXPAND_QUEUE="$(echo ${_LB_EXPAND_QUEUE} ${_LB_INCLUDES} |
sed -e 's|[ ]*$||' -e 's|^[ ]*||')"
;;
*)
- if [ ${_LH_ENABLED} -eq 1 ]
+ if [ ${_LB_ENABLED} -eq 1 ]
then
- echo "${_LH_LINE}"
+ echo "${_LB_LINE}"
fi
;;
esac
- done < "${_LH_LIST_LOCATION}"
+ done < "${_LB_LIST_LOCATION}"
done
}
diff --git a/functions/templates.sh b/functions/templates.sh
index dd774c5..d365ccd 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -15,11 +15,11 @@ Check_templates ()
if [ -d "config/templates/${PACKAGE}" ]
then
TEMPLATES="config/templates/${PACKAGE}"
- elif [ -d "${LH_TEMPLATES}/${PACKAGE}" ]
+ elif [ -d "${LB_TEMPLATES}/${PACKAGE}" ]
then
- TEMPLATES="${LH_TEMPLATES}/${PACKAGE}"
+ TEMPLATES="${LB_TEMPLATES}/${PACKAGE}"
else
- Echo_error "%s templates not accessible in %s nor config/templates" "${PACKAGE}" "${LH_TEMPLATES}"
+ Echo_error "%s templates not accessible in %s nor config/templates" "${PACKAGE}" "${LB_TEMPLATES}"
exit 1
fi
}
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
index a856756..3b8a672 100755
--- a/functions/wrapper.sh
+++ b/functions/wrapper.sh
@@ -10,7 +10,7 @@
Apt ()
{
- case "${LH_APT}" in
+ case "${LB_APT}" in
apt|apt-get)
Chroot chroot apt-get ${APT_OPTIONS} ${@}
;;
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 0cc5ce3..a6088bd 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -685,8 +685,8 @@ defines if win32\-loader should be included in the binary image or not.
.\" FIXME
.\" FIXME
All command line switches can also be specified through the corresponding
-environment variable. Environment variables are name LH_FOO, means,
-e.g. \-\-apt\-ftp\-proxy becomes LH_APT_FTP_PROXY. However, this generally
+environment variable. Environment variables are name LB_FOO, means,
+e.g. \-\-apt\-ftp\-proxy becomes LB_APT_FTP_PROXY. However, this generally
should not be used.
.SH DATEIEN
@@ -695,7 +695,7 @@ should not be used.
.IP \fB/etc/default/live\-build\fP 4
.\" FIXME
An optional, global configuration file for \fBlb config\fP variables. It is
-useful to specify a few system wide defaults, like LH_MIRROR_BOOTSTRAP. This
+useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This
feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fP option.
.SH "SIEHE AUCH"
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 1581f7a..9eb92b1 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -422,14 +422,14 @@ defines if win32\-loader should be included in the binary image or not.
.SH ENVIRONMENT
.\" FIXME
-All command line switches can also be specified through the corresponding environment variable. Environment variables are name LH_FOO, means, e.g. \-\-apt\-ftp\-proxy becomes LH_APT_FTP_PROXY. However, this generally should not be used.
+All command line switches can also be specified through the corresponding environment variable. Environment variables are name LB_FOO, means, e.g. \-\-apt\-ftp\-proxy becomes LB_APT_FTP_PROXY. However, this generally should not be used.
.\" FIXME
.SH FILES
.\" FIXME
.IP "\fBauto/config\fR" 4
.IP "\fB/etc/default/live\-build\fR" 4
-An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LH_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
+An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
.\" FIXME
.SH SEE ALSO
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 7274943..159f1c1 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -2666,8 +2666,8 @@ msgstr ""
#: en/lb_config.1:427
msgid ""
"All command line switches can also be specified through the corresponding "
-"environment variable. Environment variables are name LH_FOO, means, e.g. --"
-"apt-ftp-proxy becomes LH_APT_FTP_PROXY. However, this generally should not "
+"environment variable. Environment variables are name LB_FOO, means, e.g. --"
+"apt-ftp-proxy becomes LB_APT_FTP_PROXY. However, this generally should not "
"be used."
msgstr ""
@@ -2689,6 +2689,6 @@ msgstr "B</etc/default/live-build>"
#: en/lb_config.1:434
msgid ""
"An optional, global configuration file for B<lb config> variables. It is "
-"useful to specify a few system wide defaults, like LH_MIRROR_BOOTSTRAP. This "
+"useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
"feature can be false by specifying the B<--ignore-system-defaults> option."
msgstr ""
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 93180a7..afba628 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -2652,8 +2652,8 @@ msgstr ""
#: en/lb_config.1:427
msgid ""
"All command line switches can also be specified through the corresponding "
-"environment variable. Environment variables are name LH_FOO, means, e.g. --"
-"apt-ftp-proxy becomes LH_APT_FTP_PROXY. However, this generally should not "
+"environment variable. Environment variables are name LB_FOO, means, e.g. --"
+"apt-ftp-proxy becomes LB_APT_FTP_PROXY. However, this generally should not "
"be used."
msgstr ""
@@ -2675,6 +2675,6 @@ msgstr ""
#: en/lb_config.1:434
msgid ""
"An optional, global configuration file for B<lb config> variables. It is "
-"useful to specify a few system wide defaults, like LH_MIRROR_BOOTSTRAP. This "
+"useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
"feature can be false by specifying the B<--ignore-system-defaults> option."
msgstr ""
diff --git a/po/live-build.pot b/po/live-build.pot
index b106bce..0418f35 100644
--- a/po/live-build.pot
+++ b/po/live-build.pot
@@ -334,8 +334,8 @@ msgstr ""
#: ../helpers/lh_binary_debian-installer:467
msgid ""
-"You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and "
-"LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
+"You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and "
+"LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
"cached - these are required when integrating the Debian Installer."
msgstr ""
@@ -1034,13 +1034,13 @@ msgstr ""
msgid ""
"You have placed some preseeding files into config/binary_debian-installer "
"but you didn't specify the default preseeding file through "
-"LH_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not "
+"LB_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not "
"take up a preseeding file by default."
msgstr ""
#: ../functions/defaults.sh:769
msgid ""
-"You selected LH_DISTRIBUTION='etch' and LH_INITRAMFS='live-initramfs' This "
+"You selected LB_DISTRIBUTION='etch' and LB_INITRAMFS='live-initramfs' This "
"is a possible unsafe configuration as live-initramfs is not part of the etch "
"distribution. Either make sure that live-initramfs is installable (e.g. "
"through setting up etch-backports repository as third-party source or "
@@ -1050,7 +1050,7 @@ msgstr ""
#: ../functions/defaults.sh:775
msgid ""
-"You selected LH_DISTRIBUTION='etch' and LH_UNION_FILESYSTEM='aufs' This is a "
+"You selected LB_DISTRIBUTION='etch' and LB_UNION_FILESYSTEM='aufs' This is a "
"possible unsafe configuration as aufs is not part of the etch distribution. "
"Either make sure that aufs modules for your kernel are installable (e.g. "
"through setting up etch-backports repository as third-party source or "
@@ -1059,20 +1059,20 @@ msgid ""
msgstr ""
#: ../functions/defaults.sh:785
-msgid "You selected LH_PACKAGES_LISTS='%s' and LH_APT='aptitude'"
+msgid "You selected LB_PACKAGES_LISTS='%s' and LB_APT='aptitude'"
msgstr ""
#: ../functions/defaults.sh:794
msgid ""
-"You have selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES an "
-"dLH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
+"You have selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES an "
+"dLB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
"cached. This is a possible unsafe configuration as the bootstrap packages "
"are re-used when integrating the Debian Installer."
msgstr ""
#: ../functions/defaults.sh:805
msgid ""
-"You have selected values of LH_BOOTLOADER and LH_BINARY_FILESYSTEM which are "
+"You have selected values of LB_BOOTLOADER and LB_BINARY_FILESYSTEM which are "
"incompatible - syslinux only supports FAT filesystems."
msgstr ""
diff --git a/po/live-helper.pot b/po/live-helper.pot
index b106bce..0418f35 100644
--- a/po/live-helper.pot
+++ b/po/live-helper.pot
@@ -334,8 +334,8 @@ msgstr ""
#: ../helpers/lh_binary_debian-installer:467
msgid ""
-"You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and "
-"LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
+"You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and "
+"LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
"cached - these are required when integrating the Debian Installer."
msgstr ""
@@ -1034,13 +1034,13 @@ msgstr ""
msgid ""
"You have placed some preseeding files into config/binary_debian-installer "
"but you didn't specify the default preseeding file through "
-"LH_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not "
+"LB_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not "
"take up a preseeding file by default."
msgstr ""
#: ../functions/defaults.sh:769
msgid ""
-"You selected LH_DISTRIBUTION='etch' and LH_INITRAMFS='live-initramfs' This "
+"You selected LB_DISTRIBUTION='etch' and LB_INITRAMFS='live-initramfs' This "
"is a possible unsafe configuration as live-initramfs is not part of the etch "
"distribution. Either make sure that live-initramfs is installable (e.g. "
"through setting up etch-backports repository as third-party source or "
@@ -1050,7 +1050,7 @@ msgstr ""
#: ../functions/defaults.sh:775
msgid ""
-"You selected LH_DISTRIBUTION='etch' and LH_UNION_FILESYSTEM='aufs' This is a "
+"You selected LB_DISTRIBUTION='etch' and LB_UNION_FILESYSTEM='aufs' This is a "
"possible unsafe configuration as aufs is not part of the etch distribution. "
"Either make sure that aufs modules for your kernel are installable (e.g. "
"through setting up etch-backports repository as third-party source or "
@@ -1059,20 +1059,20 @@ msgid ""
msgstr ""
#: ../functions/defaults.sh:785
-msgid "You selected LH_PACKAGES_LISTS='%s' and LH_APT='aptitude'"
+msgid "You selected LB_PACKAGES_LISTS='%s' and LB_APT='aptitude'"
msgstr ""
#: ../functions/defaults.sh:794
msgid ""
-"You have selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES an "
-"dLH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
+"You have selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES an "
+"dLB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
"cached. This is a possible unsafe configuration as the bootstrap packages "
"are re-used when integrating the Debian Installer."
msgstr ""
#: ../functions/defaults.sh:805
msgid ""
-"You have selected values of LH_BOOTLOADER and LH_BINARY_FILESYSTEM which are "
+"You have selected values of LB_BOOTLOADER and LB_BINARY_FILESYSTEM which are "
"incompatible - syslinux only supports FAT filesystems."
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 781092e..fdf1b98 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -69,12 +69,12 @@ msgstr "Não encontrei cache/packages_bootstrap."
#: ../helpers/lh_binary_debian-installer:467
msgid ""
-"You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and "
-"LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
+"You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and "
+"LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
"cached - these are required when integrating the Debian Installer."
msgstr ""
-"Você selecionou valores para LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES e "
-"LH_DEBIAN_INSTALLER que resultará na não realização de cache dos pacotes de "
+"Você selecionou valores para LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES e "
+"LB_DEBIAN_INSTALLER que resultará na não realização de cache dos pacotes de "
"'bootstrap' - note que estes são requeridos quando há integração com o "
"Instalador do Debian."
@@ -926,17 +926,17 @@ msgstr "Arquitetura ainda não suportada (FIXME)"
msgid ""
"You have placed some preseeding files into config/binary_debian-installer "
"but you didn't specify the default preseeding file through "
-"LH_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not "
+"LB_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not "
"take up a preseeding file by default."
msgstr ""
"Você colocou alguns arquivos de preseeding dentro de config/binary_debian-"
"installer mas você não especificou o arquivo de preseeding padrão através de"
-"LH_DEBIAN_INSTALLER_PRESEEDFILE. Isso significa que o instalador do "
+"LB_DEBIAN_INSTALLER_PRESEEDFILE. Isso significa que o instalador do "
"Debian não utilizará um arquivo de preseeding por padrão."
#: ../functions/defaults.sh:769
msgid ""
-"You selected LH_DISTRIBUTION='etch' and LH_INITRAMFS='live-initramfs' This "
+"You selected LB_DISTRIBUTION='etch' and LB_INITRAMFS='live-initramfs' This "
"is a possible unsafe configuration as live-initramfs is not part of the etch "
"distribution. Either make sure that live-initramfs is installable (e.g. "
"through setting up etch-backports repository as third-party source or "
@@ -946,7 +946,7 @@ msgstr ""
#: ../functions/defaults.sh:775
msgid ""
-"You selected LH_DISTRIBUTION='etch' and LH_UNION_FILESYSTEM='aufs' This is a "
+"You selected LB_DISTRIBUTION='etch' and LB_UNION_FILESYSTEM='aufs' This is a "
"possible unsafe configuration as aufs is not part of the etch distribution. "
"Either make sure that aufs modules for your kernel are installable (e.g. "
"through setting up etch-backports repository as third-party source or "
@@ -955,20 +955,20 @@ msgid ""
msgstr ""
#: ../functions/defaults.sh:785
-msgid "You selected LH_PACKAGES_LISTS='%s' and LH_APT='aptitude'"
-msgstr "Você selecionou LH_PACKAGES_LISTS='%s' e LH_APT='aptitude'"
+msgid "You selected LB_PACKAGES_LISTS='%s' and LB_APT='aptitude'"
+msgstr "Você selecionou LB_PACKAGES_LISTS='%s' e LB_APT='aptitude'"
#: ../functions/defaults.sh:794
msgid ""
-"You have selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES an "
-"dLH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
+"You have selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES an "
+"dLB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being "
"cached. This is a possible unsafe configuration as the bootstrap packages "
"are re-used when integrating the Debian Installer."
msgstr ""
#: ../functions/defaults.sh:805
msgid ""
-"You have selected values of LH_BOOTLOADER and LH_BINARY_FILESYSTEM which are "
+"You have selected values of LB_BOOTLOADER and LB_BINARY_FILESYSTEM which are "
"incompatible - syslinux only supports FAT filesystems."
msgstr ""
diff --git a/scripts/build.sh b/scripts/build.sh
index 4c156c5..443e9ee 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-LH_BASE="${LH_BASE:-/usr/share/live/build}"
+LB_BASE="${LB_BASE:-/usr/share/live/build}"
# Source global functions
-for FUNCTION in "${LH_BASE}"/functions/*.sh
+for FUNCTION in "${LB_BASE}"/functions/*.sh
do
. "${FUNCTION}"
done
diff --git a/scripts/build/binary b/scripts/build/binary
index 52c627e..d9cd28c 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary images')"
@@ -30,7 +30,7 @@ Setup_cleanup
# Preparing root filesystem
lb binary_chroot ${*}
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Configuring chroot
lb chroot_devpts install ${*}
@@ -68,7 +68,7 @@ lb binary_local-includes ${*}
lb binary_local-hooks ${*}
lb binary_checksums ${*}
-if [ "${LH_BUILD_WITH_CHROOT}" != "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
then
lb chroot_devpts install ${*}
lb chroot_proc install ${*}
@@ -83,7 +83,7 @@ lb binary_tar ${*}
lb binary_usb ${*}
lb binary_virtual-hdd ${*}
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Deconfiguring chroot
rm -f .stage/chroot_sources
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index 17f24d5..a45f1a3 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'create binary checksums')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_CHECKSUMS}" = "none" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_CHECKSUMS}" = "none" ] || [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
then
exit 0
fi
@@ -41,7 +41,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-for CHECKSUM in ${LH_CHECKSUMS}
+for CHECKSUM in ${LB_CHECKSUMS}
do
Echo_message "Begin creating binary ${CHECKSUM}sum.txt..."
diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot
index 717d11d..46e4524 100755
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy chroot into chroot')"
@@ -41,9 +41,9 @@ Create_lockfile .lock
# Normally, virtual filesystems are not mounted here, but people tend to be lazy
if [ -f chroot/proc/version ]
then
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
- ${LH_ROOT_COMMAND} umount chroot/proc
+ ${LB_ROOT_COMMAND} umount chroot/proc
else
rm -rf chroot/proc
mkdir -p chroot/proc
@@ -52,9 +52,9 @@ fi
if [ -d chroot/sys/kernel ]
then
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
- ${LH_ROOT_COMMAND} umount chroot/sys
+ ${LB_ROOT_COMMAND} umount chroot/sys
else
rm -rf chroot/sys
mkdir -p chroot/sys
@@ -62,18 +62,18 @@ then
fi
# Copying /dev if using fakeroot
-if [ "${LH_USE_FAKEROOT}" = "true" ]
+if [ "${LB_USE_FAKEROOT}" = "true" ]
then
rm -rf chroot/dev
find /dev | cpio -dmpu chroot
fi
-if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "false" ]
then
exit 0
fi
-if [ "${LH_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem*
+if [ "${LB_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem*
then
exit 0
fi
@@ -81,25 +81,25 @@ fi
Echo_message "This may take a while."
# Removing old chroot
-${LH_ROOT_COMMAND} rm -rf chroot/chroot
-${LH_ROOT_COMMAND} rm -rf chroot.tmp
+${LB_ROOT_COMMAND} rm -rf chroot/chroot
+${LB_ROOT_COMMAND} rm -rf chroot.tmp
# Copying new chroot
-if [ -d cache/stages_bootstrap ] && [ "${LH_CHROOT_FILESYSTEM}" != "plain" ]
+if [ -d cache/stages_bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "plain" ]
then
- ${LH_ROOT_COMMAND} mv chroot chroot.tmp
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
- ${LH_ROOT_COMMAND} touch chroot/chroot.cache
+ ${LB_ROOT_COMMAND} mv chroot chroot.tmp
+ ${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+ ${LB_ROOT_COMMAND} touch chroot/chroot.cache
else
- ${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
+ ${LB_ROOT_COMMAND} cp -a chroot chroot.tmp
fi
-${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
+${LB_ROOT_COMMAND} mv chroot.tmp chroot/chroot
# Handling chroot excludes
if [ -f config/binary_rootfs/excludes ]
then
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp config/binary_rootfs/excludes chroot/chroot/excludes
chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
@@ -114,9 +114,9 @@ then
esac
fi
-if [ -n "${LH_ROOT_COMMAND}" ]
+if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Creating stage file
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 4f77873..9913cfb 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install debian-installer into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
then
exit 0
fi
@@ -40,7 +40,7 @@ else
fi
# Check d-i configuration
-case "${LH_DEBIAN_INSTALLER}" in
+case "${LB_DEBIAN_INSTALLER}" in
true|cdrom|netinst|netboot|businesscard|live)
;;
@@ -49,7 +49,7 @@ case "${LH_DEBIAN_INSTALLER}" in
;;
*)
- Echo_error "debian-installer flavour %s not supported." "${LH_DEBIAN_INSTALLER}"
+ Echo_error "debian-installer flavour %s not supported." "${LB_DEBIAN_INSTALLER}"
exit 1
;;
esac
@@ -79,9 +79,9 @@ Restore_cache cache/packages_binary
Install_package
# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
net)
- DESTDIR="tftpboot/debian-install/${LH_ARCHITECTURE}"
+ DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURE}"
;;
usb*|tar)
@@ -94,12 +94,12 @@ case "${LH_BINARY_IMAGES}" in
esac
# Set d-i image type
-case "${LH_DEBIAN_INSTALLER}" in
+case "${LB_DEBIAN_INSTALLER}" in
businesscard|netboot|netinst)
DI_IMAGE_TYPE="netboot"
;;
*)
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
net)
DI_IMAGE_TYPE="netboot"
;;
@@ -112,15 +112,15 @@ case "${LH_DEBIAN_INSTALLER}" in
esac
# Set architecture-specific variables
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
powerpc)
case "${DI_IMAGE_TYPE}" in
cdrom)
- DI_REMOTE_BASE="${LH_ARCHITECTURE}/cdrom"
+ DI_REMOTE_BASE="${LB_ARCHITECTURE}/cdrom"
;;
netboot)
- DI_REMOTE_BASE="${LH_ARCHITECTURE}/netboot"
+ DI_REMOTE_BASE="${LB_ARCHITECTURE}/netboot"
;;
esac
@@ -129,7 +129,7 @@ case "${LH_ARCHITECTURE}" in
;;
sparc)
- DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+ DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DI_REMOTE_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DI_REMOTE_BASE_GTK="none"
@@ -138,8 +138,8 @@ case "${LH_ARCHITECTURE}" in
*)
case "${DI_IMAGE_TYPE}" in
netboot)
- DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}"
- DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}"
+ DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURE}"
+ DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURE}"
DI_REMOTE_KERNEL="linux"
;;
@@ -187,35 +187,35 @@ Install_file() {
# Set absolute directory for caching; we require it when we call Download_file
# from a non-standard cwd.
-_LH_CACHE_DIR="$(pwd)/cache/binary_debian-installer"
+_LB_CACHE_DIR="$(pwd)/cache/binary_debian-installer"
Download_file () {
- local _LH_TARGET
- _LH_TARGET="${1}"
+ local _LB_TARGET
+ _LB_TARGET="${1}"
- local _LH_URL
- _LH_URL="${2}"
+ local _LB_URL
+ _LB_URL="${2}"
- _LH_CACHE_FILE="${_LH_CACHE_DIR}/$(echo "${_LH_URL}" | sed 's|/|_|g')"
+ _LB_CACHE_FILE="${_LB_CACHE_DIR}/$(echo "${_LB_URL}" | sed 's|/|_|g')"
- if [ ! -f "${_LH_CACHE_FILE}" ]
+ if [ ! -f "${_LB_CACHE_FILE}" ]
then
- mkdir -p ${_LH_CACHE_DIR}
- if ! wget ${WGET_OPTIONS} -O "${_LH_CACHE_FILE}" "${_LH_URL}"
+ mkdir -p ${_LB_CACHE_DIR}
+ if ! wget ${WGET_OPTIONS} -O "${_LB_CACHE_FILE}" "${_LB_URL}"
then
- rm -f "${_LH_CACHE_FILE}"
+ rm -f "${_LB_CACHE_FILE}"
- Echo_error "Could not download file: %s" "${_LH_URL}"
+ Echo_error "Could not download file: %s" "${_LB_URL}"
exit 1
fi
fi
- if [ "$(stat --printf %d "${_LH_CACHE_DIR}")" = "$(stat --printf %d ./)" ]
+ if [ "$(stat --printf %d "${_LB_CACHE_DIR}")" = "$(stat --printf %d ./)" ]
then
CP_OPTIONS="-l"
fi
- cp -f ${CP_OPTIONS} -- "${_LH_CACHE_FILE}" "${_LH_TARGET}"
+ cp -f ${CP_OPTIONS} -- "${_LB_CACHE_FILE}" "${_LB_TARGET}"
}
VMLINUZ_DI="vmlinuz"
@@ -226,14 +226,14 @@ VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
-if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
+if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
then
- LH_DEBIAN_INSTALLER_DISTRIBUTION="sid"
+ LB_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
alpha|amd64|hppa|ia64|mips|mipsel|powerpc)
- URL="http://d-i.debian.org/daily-images/${LH_ARCHITECTURE}/daily/"
+ URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURE}/daily/"
;;
arm|armel)
@@ -262,24 +262,24 @@ then
;;
esac
else
- URL="${LH_MIRROR_DEBIAN_INSTALLER}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
+ URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURE}/current/images/"
fi
mkdir -p "${DESTDIR_DI}"
-if [ "${LH_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
+if [ "${LB_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
then
# There are no prepared kernel/initrd pairs for sparc netboot so we
# must unpack them from a mini.iso
Download_file mini.iso ${URL}/mini.iso
mkdir mini.tmp
- ${LH_ROOT_COMMAND} mount -o loop -t iso9660 mini.iso mini.tmp
+ ${LB_ROOT_COMMAND} mount -o loop -t iso9660 mini.iso mini.tmp
cp mini.tmp/boot/vmlinuz-${DEFAULT_FLAVOUR} "${DESTDIR}"/"${VMLINUZ_DI}"
cp mini.tmp/boot/initrd.gz "${DESTDIR}"/"${INITRD_DI}"
- ${LH_ROOT_COMMAND} umount mini.tmp
+ ${LB_ROOT_COMMAND} umount mini.tmp
rm -rf mini.tmp mini.iso
else
# Downloading debian-installer
@@ -288,15 +288,15 @@ else
# Downloading graphical-installer
DOWNLOAD_GTK_INSTALLER=0
- if [ "${LH_DEBIAN_INSTALLER_GUI}" = "true" ]
+ if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
then
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
DOWNLOAD_GTK_INSTALLER=1
;;
powerpc)
- if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "netboot" ]
then
DOWNLOAD_GTK_INSTALLER=1
fi
@@ -321,12 +321,12 @@ then
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64)
#DI_REQ_PACKAGES="lilo grub grub2"
DI_REQ_PACKAGES="lilo grub"
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
;;
@@ -341,7 +341,7 @@ then
#DI_REQ_PACKAGES="elilo lilo grub grub2"
DI_REQ_PACKAGES="elilo lilo grub"
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
;;
@@ -366,9 +366,9 @@ then
DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2"
# Set apt command prefix
- _LH_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
+ _LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
- if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# We don't want to duplicate .debs of packages in binary/pool that are already
# installed to target/ via live-installer.
@@ -390,16 +390,16 @@ then
done
# Download .deb's that we just marked as "purged" which caused broken dependencies
- Chroot chroot ${_LH_APT_COMMAND} -f dist-upgrade
+ Chroot chroot ${_LB_APT_COMMAND} -f dist-upgrade
# Revert dpkg status file
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
# Download .debs of the required packages
- Chroot chroot ${_LH_APT_COMMAND} install ${DI_REQ_PACKAGES}
+ Chroot chroot ${_LB_APT_COMMAND} install ${DI_REQ_PACKAGES}
else
# Download .debs of the required packages
- Chroot chroot ${_LH_APT_COMMAND} install ${DI_PACKAGES}
+ Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES}
# Revert dpkg status file
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
@@ -415,7 +415,7 @@ then
done
fi
- if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+ if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
then
# Including base debian packages
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
@@ -426,15 +426,15 @@ then
done
else
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."
+ Echo_error "You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
exit 1
fi
fi
# Including local debs
- if Find_files config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+ if Find_files config/binary_local-debs/*_"${LB_ARCHITECTURE}".deb
then
- for FILE in config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+ for FILE in config/binary_local-debs/*_"${LB_ARCHITECTURE}".deb
do
Install_file "${FILE}" "binary/pool/main"
done
@@ -449,24 +449,24 @@ then
fi
# Generating deb indices
- mkdir -p binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}
+ mkdir -p binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}
mv binary chroot/root
- echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages" > chroot/binary.sh
+ echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Packages" > chroot/binary.sh
Chroot chroot "sh binary.sh"
rm -f chroot/binary.sh
mv chroot/root/binary ./
- gzip -9 -c binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages.gz
+ gzip -9 -c binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Packages > binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Packages.gz
# Fetching release
- Download_file binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release "${LH_MIRROR_CHROOT}"/dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release
+ Download_file binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURE}/Release "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURE}"/Release
mkdir binary.udeb
cd binary.udeb
# Downloading udeb indices
- Download_file Packages.gz "${LH_MIRROR_CHROOT}"/dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz
+ Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.gz > Packages
# Sorting udebs
@@ -481,7 +481,7 @@ then
cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
else
# Downloading udebs
- wget ${WGET_OPTIONS} "${LH_MIRROR_CHROOT}"/${UDEB}
+ wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB}
fi
done
@@ -491,9 +491,9 @@ then
cp *.udeb ../cache/packages_debian-installer.udeb
# Including local udebs
- if Find_files ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
+ if Find_files ../config/binary_local-udebs/*_"${LB_ARCHITECTURE}".udeb
then
- for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
+ for FILE in ../config/binary_local-udebs/*_"${LB_ARCHITECTURE}".udeb
do
Install_file "${FILE}" "pool/main"
@@ -514,9 +514,9 @@ then
fi
# Excluding udebs
- grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true
- grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true
- grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude || true
+ grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true
+ grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true
+ grep -v "^#" "${LB_BASE}"/data/debian-cd/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LB_ARCHITECTURE} >> exclude || true
# Local exclude file
if [ -e ../config/binary_debian-installer/udeb_exclude ]
@@ -529,7 +529,7 @@ then
while read EXCLUDE
do
- if [ "${LH_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
then
continue
fi
@@ -538,7 +538,7 @@ then
done < exclude
# Enable live-installer
- if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# Remove local udebs
rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
@@ -558,17 +558,17 @@ then
done
# Creating udeb indices
- mkdir -p dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"
+ mkdir -p dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURE}"
cd "${OLDPWD}"
mv binary.udeb chroot/root
- echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages" > chroot/binary.sh
+ echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}/Packages" > chroot/binary.sh
Chroot chroot "sh binary.sh"
rm -f chroot/binary.sh
mv chroot/root/binary.udeb ./
cd binary.udeb
- gzip -9 -c dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages.gz
+ gzip -9 -c dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}/Packages > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURE}/Packages.gz
rm -f Packages* exclude
find . | cpio -dmpu "${OLDPWD}"/binary
@@ -584,14 +584,14 @@ cat > chroot/binary.sh << EOF
cd /root/binary && apt-ftparchive \
-o APT::FTPArchive::Release::Origin="Debian" \
-o APT::FTPArchive::Release::Label="Debian" \
- -o APT::FTPArchive::Release::Suite="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Suite="${LB_DEBIAN_INSTALLER_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Version="4.0" \
- -o APT::FTPArchive::Release::Codename="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Codename="${LB_DEBIAN_INSTALLER_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \
- -o APT::FTPArchive::Release::Architectures="${LH_ARCHITECTURE}" \
+ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="main" \
-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
- release dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/Release
+ release dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/Release
EOF
Chroot chroot "sh binary.sh"
@@ -601,10 +601,10 @@ EOF
# Creating dist symlinks
for DISTRIBUTION in frozen stable testing unstable
do
- ln -s ${LH_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+ ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
done
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
usb*)
;;
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index ec33d19..7a15c8d 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install disk information into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*|usb*)
;;
*)
@@ -48,13 +48,13 @@ Create_lockfile .lock
mkdir -p binary/.disk
-ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
-DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
-DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
-eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
+ARCHITECTURE="$(echo ${LB_ARCHITECTURE} | sed -e 's| |/|g')"
+DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
+DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
+eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
TITLE="Debian GNU/Linux"
-case "${LH_MODE}" in
+case "${LB_MODE}" in
debian)
STRING="Official Snapshot ${ARCHITECTURE}"
TRACE="project/trace/ftp-master.debian.org"
@@ -79,11 +79,11 @@ esac
if [ -n "${TRACE}" ]
then
- echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ echo "$(wget -q ${LB_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
> binary/.disk/archive_trace
fi
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
for INITRD in binary/casper/initrd.img*
do
@@ -105,7 +105,7 @@ case "${LH_INITRAMFS}" in
;;
esac
-case "${LH_DEBIAN_INSTALLER}" in
+case "${LB_DEBIAN_INSTALLER}" in
cdrom)
echo "main" > binary/.disk/base_components
@@ -115,7 +115,7 @@ case "${LH_DEBIAN_INSTALLER}" in
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
+ cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
;;
true|netinst|live)
@@ -125,7 +125,7 @@ case "${LH_DEBIAN_INSTALLER}" in
echo "not_complete" > binary/.disk/cd_type
- if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
else
@@ -133,9 +133,9 @@ case "${LH_DEBIAN_INSTALLER}" in
fi
- cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
+ cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
- if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
echo "live-installer" >> binary/.disk/udeb_include
fi
@@ -148,7 +148,7 @@ case "${LH_DEBIAN_INSTALLER}" in
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
+ cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
;;
false)
diff --git a/scripts/build/binary_encryption b/scripts/build/binary_encryption
index 79b556d..f5e6458 100755
--- a/scripts/build/binary_encryption
+++ b/scripts/build/binary_encryption
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'encrypts rootfs')"
@@ -24,29 +24,29 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
then
exit 0
fi
-case "${LH_ENCRYPTION}" in
+case "${LB_ENCRYPTION}" in
aes128|aes192|aes256)
;;
""|false)
exit 0
;;
*)
- Echo_error "Encryption type %s not supported." "${LH_ENCRYPTION}"
+ Echo_error "Encryption type %s not supported." "${LB_ENCRYPTION}"
exit 1
;;
esac
-case "${LH_CHROOT_FILESYSTEM}" in
+case "${LB_CHROOT_FILESYSTEM}" in
ext2|squashfs)
;;
*)
- Echo_error "Encryption not yet supported on %s filesystems." "${LH_CHROOT_FILESYSTEM}"
+ Echo_error "Encryption not yet supported on %s filesystems." "${LB_CHROOT_FILESYSTEM}"
exit 1
;;
esac
@@ -65,7 +65,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
;;
@@ -84,12 +84,12 @@ Restore_cache cache/packages_binary
# Installing depends
Install_package
-Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}"
+Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LB_CHROOT_FILESYSTEM}" "${LB_ENCRYPTION}"
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Moving image
- mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot
+ mv binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} chroot
fi
while true
@@ -101,22 +101,22 @@ do
Echo " (Passwords must be at least 20 characters long)"
echo
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
- if Chroot chroot aespipe -e ${LH_ENCRYPTION} -T \
- < chroot/filesystem.${LH_CHROOT_FILESYSTEM} \
- > chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+ if Chroot chroot aespipe -e ${LB_ENCRYPTION} -T \
+ < chroot/filesystem.${LB_CHROOT_FILESYSTEM} \
+ > chroot/filesystem.${LB_CHROOT_FILESYSTEM}.tmp
then
- mv chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+ mv chroot/filesystem.${LB_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
break
fi
;;
false)
- if aespipe -e ${LH_ENCRYPTION} -T \
- < binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} \
- > binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+ if aespipe -e ${LB_ENCRYPTION} -T \
+ < binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} \
+ > binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}.tmp
then
- mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+ mv binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
break
fi
;;
@@ -133,9 +133,9 @@ do
done
# Cleanup temporary filesystems
-rm -f chroot/filesystem.${LH_CHROOT_FILESYSTEM}
-rm -f chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
-rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+rm -f chroot/filesystem.${LB_CHROOT_FILESYSTEM}
+rm -f chroot/filesystem.${LB_CHROOT_FILESYSTEM}.tmp
+rm -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}.tmp
# Saving cache
Save_cache cache/packages_binary
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index 1597b3c..802bfbe 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTLOADER}" != "grub" ]
+if [ "${LB_BOOTLOADER}" != "grub" ]
then
exit 0
fi
@@ -68,7 +68,7 @@ Grub_live_entry ()
APPEND="${4}"
LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
- LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
+ LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-config LB_BOOTAPPEND_LIVE ${APPEND}"
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
}
@@ -112,12 +112,12 @@ Grub_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\t${LABEL} ${TYPE}"
- LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}"
+ LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND} ${LB_BOOTAPPEND_INSTALL}"
LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
done
}
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
;;
@@ -128,9 +128,9 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*|tar)
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
;;
@@ -157,62 +157,62 @@ mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-case "${LH_ENCRYPTION}" in
+case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}"
esac
-if [ -n "${LH_USERNAME}" ]
+if [ -n "${LB_USERNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_USERNAME}" != "user" ]
+ if [ "${LB_USERNAME}" != "user" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LH_HOSTNAME}" ]
+if [ -n "${LB_HOSTNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_HOSTNAME}" != "debian" ]
+ if [ "${LB_HOSTNAME}" != "debian" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ -n "${LH_NET_COW_PATH}" ]
+if [ -n "${LB_NET_COW_PATH}" ]
then
Echo_error "Net cow not yet supported on grub"
exit 1
fi
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
+if [ "${LB_EXPOSED_ROOT}" != "false" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
+LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
@@ -220,7 +220,7 @@ FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
@@ -238,7 +238,7 @@ done
LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
LINUX_INSTALL="title\t\tInstaller:\nroot"
@@ -268,7 +268,7 @@ LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g'
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
MEMTEST="title\t\tOther:\nroot"
- MEMTEST="${MEMTEST}\n\ntitle\t\t${LH_MEMTEST}\nkernel\t\t/$(basename ${DESTDIR_LIVE})/memtest"
+ MEMTEST="${MEMTEST}\n\ntitle\t\t${LB_MEMTEST}\nkernel\t\t/$(basename ${DESTDIR_LIVE})/memtest"
MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
fi
@@ -276,7 +276,7 @@ fi
mkdir -p binary/boot/grub
cp -r "${TEMPLATES}"/* binary/boot/grub
-case ${LH_BINARY_IMAGES} in
+case ${LB_BINARY_IMAGES} in
iso*)
FILES="chroot/usr/lib/grub/*/stage2_eltorito"
;;
@@ -286,7 +286,7 @@ case ${LH_BINARY_IMAGES} in
;;
esac
-if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "false" ]
then
FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
fi
@@ -303,15 +303,15 @@ fi
# Copying splash screen
if [ -f config/binary_grub/splash.xpm.gz ]
then
- LH_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+ LB_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
elif [ -f config/binary_grub/splash.xpm ]
then
- LH_GRUB_SPLASH="config/binary_grub/splash.xpm"
+ LB_GRUB_SPLASH="config/binary_grub/splash.xpm"
fi
-if [ -n "${LH_GRUB_SPLASH}" ]
+if [ -n "${LB_GRUB_SPLASH}" ]
then
- if [ "${LH_GRUB_SPLASH}" = "none" ]
+ if [ "${LB_GRUB_SPLASH}" = "none" ]
then
# Removing splash file
rm -f binary/boot/grub/splash.xpm.gz
@@ -320,13 +320,13 @@ then
sed -i -e "s|splashimage.*||" binary/boot/grub/menu.lst
else
# Overwriting splash file
- cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
- sed -i -e "s|splashimage.*|splashimage /boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/menu.lst
+ cp -f "${LB_GRUB_SPLASH}" binary/boot/grub
+ sed -i -e "s|splashimage.*|splashimage /boot/grub/$(basename ${LB_GRUB_SPLASH})|" binary/boot/grub/menu.lst
fi
fi
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst
-sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst
+sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst
sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index 3813c76..8610eee 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub2 into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTLOADER}" != "grub2" ]
+if [ "${LB_BOOTLOADER}" != "grub2" ]
then
exit 0
fi
@@ -68,7 +68,7 @@ Grub_live_entry ()
APPEND="${4}"
LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
- LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
+ LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-config LB_BOOTAPPEND_LIVE ${APPEND}"
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
LINUX_LIVE="${LINUX_LIVE}\n}"
}
@@ -86,12 +86,12 @@ Grub_install_entry ()
fi
LINUX_INSTALL="${LINUX_INSTALL}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
- LINUX_INSTALL="${LINUX_INSTALL}\nlinux\t\t/${KERNEL} ${APPEND} LH_BOOTAPPEND_INSTALL"
+ LINUX_INSTALL="${LINUX_INSTALL}\nlinux\t\t/${KERNEL} ${APPEND} LB_BOOTAPPEND_INSTALL"
LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
LINUX_INSTALL="${LINUX_INSTALL}\n}"
}
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
;;
@@ -102,9 +102,9 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*|tar)
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
;;
@@ -131,62 +131,62 @@ mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-case "${LH_ENCRYPTION}" in
+case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}"
esac
-if [ -n "${LH_USERNAME}" ]
+if [ -n "${LB_USERNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_USERNAME}" != "user" ]
+ if [ "${LB_USERNAME}" != "user" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LH_HOSTNAME}" ]
+if [ -n "${LB_HOSTNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_HOSTNAME}" != "debian" ]
+ if [ "${LB_HOSTNAME}" != "debian" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ -n "${LH_NET_COW_PATH}" ]
+if [ -n "${LB_NET_COW_PATH}" ]
then
Echo_error "Net cow not yet supported on grub"
exit 1
fi
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
+if [ "${LB_EXPOSED_ROOT}" != "false" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
+LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
@@ -194,7 +194,7 @@ FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
@@ -212,7 +212,7 @@ done
LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
LINUX_LIVE="#\t \"Live\"\n${LINUX_LIVE}"
LINUX_INSTALL="#\t \"Installer\"\n"
@@ -241,7 +241,7 @@ LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g'
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
MEMTEST="#\t \"Other\"\n"
- MEMTEST="${MEMTEST}\nmenuentry\t\"${LH_MEMTEST}\" {\nlinux16\t$(basename ${DESTDIR_LIVE})/memtest\n}"
+ MEMTEST="${MEMTEST}\nmenuentry\t\"${LB_MEMTEST}\" {\nlinux16\t$(basename ${DESTDIR_LIVE})/memtest\n}"
MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
fi
@@ -249,7 +249,7 @@ fi
mkdir -p binary/boot/grub
cp -r "${TEMPLATES}"/* binary/boot/grub
-case ${LH_BINARY_IMAGES} in
+case ${LB_BINARY_IMAGES} in
iso*)
FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
;;
@@ -259,7 +259,7 @@ case ${LH_BINARY_IMAGES} in
;;
esac
-if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "false" ]
then
FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
fi
@@ -276,12 +276,12 @@ fi
# Copying splash screen
if [ -f config/binary_grub/splash.tga ]
then
- LH_GRUB_SPLASH="config/binary_grub/splash.tga"
+ LB_GRUB_SPLASH="config/binary_grub/splash.tga"
fi
-if [ -n "${LH_GRUB_SPLASH}" ]
+if [ -n "${LB_GRUB_SPLASH}" ]
then
- if [ "${LH_GRUB_SPLASH}" = "none" ]
+ if [ "${LB_GRUB_SPLASH}" = "none" ]
then
# Removing splash file
rm -f binary/boot/grub/splash.tga
@@ -290,13 +290,13 @@ then
sed -i -e "s|background_image.*||" binary/boot/grub/grub.cfg
else
# Overwriting splash file
- cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
- sed -i -e "s|background_image .*.tga|background_image \$\(root\)/boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/grub.cfg
+ cp -f "${LB_GRUB_SPLASH}" binary/boot/grub
+ sed -i -e "s|background_image .*.tga|background_image \$\(root\)/boot/grub/$(basename ${LB_GRUB_SPLASH})|" binary/boot/grub/grub.cfg
fi
fi
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg
-sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/grub.cfg
+sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/boot/grub/grub.cfg
sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index 8648f64..43c7a99 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy files into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_INCLUDES}" = "none" ]
+if [ "${LB_INCLUDES}" = "none" ]
then
exit 0
fi
@@ -44,25 +44,25 @@ Check_lockfile .lock
Create_lockfile .lock
# Check user includes
-if [ ! -d "${LH_INCLUDES}" ]
+if [ ! -d "${LB_INCLUDES}" ]
then
- if [ -d ../"${LH_INCLUDES}" ]
+ if [ -d ../"${LB_INCLUDES}" ]
then
- LH_INCLUDES="../${LH_INCLUDES}"
+ LB_INCLUDES="../${LB_INCLUDES}"
else
- Echo_error "user specified includes not accessible in %s" "${LH_INCLUDES}"
+ Echo_error "user specified includes not accessible in %s" "${LB_INCLUDES}"
exit 1
fi
fi
# Checking local includes
-if [ -d config/includes/"${LH_DISTRIBUTION}" ]
+if [ -d config/includes/"${LB_DISTRIBUTION}" ]
then
- LH_INCLUDES="config/includes"
+ LB_INCLUDES="config/includes"
fi
# Assemble architecture
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
amd64)
ARCH="amd"
;;
@@ -81,9 +81,9 @@ case "${LH_ARCHITECTURE}" in
esac
# Working arround vfat limitations
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
usb*)
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
fat*)
CP_OPTIONS="-L"
;;
@@ -92,51 +92,51 @@ case "${LH_BINARY_IMAGES}" in
esac
# Copying common templates
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/*
+if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common ] && \
+Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common/*
then
- cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* binary
+ cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common/* binary
fi
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}" ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/*
+if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common."${ARCH}" ] && \
+Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common."${ARCH}"/*
then
- cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/common."${ARCH}"/* binary
fi
# Copying live templates
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/*
+if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live ] && \
+Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live/*
then
- cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* binary
+ cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live/* binary
fi
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}" ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/*
+if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live."${ARCH}" ] && \
+Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live."${ARCH}"/*
then
- cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/live."${ARCH}"/* binary
fi
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
# Copying install templates
- if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
- Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/*
+ if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install ] && \
+ Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install/*
then
- cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
+ cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install/* binary
fi
- if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
- Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/*
+ if [ -d "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install."${ARCH}" ] && \
+ Find_files "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install."${ARCH}"/*
then
- cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
+ cp -r ${CP_OPTIONS} "${LB_INCLUDES}"/"${LB_DISTRIBUTION}"/install."${ARCH}"/* binary
fi
# Adjusting install templates
- ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
- DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
- DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
- eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
+ ARCHITECTURE="$(echo ${LB_ARCHITECTURE} | sed -e 's| |/|g')"
+ DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
+ DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
+ eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
if [ -d binary/pool/main/l/live-installer ]
then
@@ -148,7 +148,7 @@ then
DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary $(date +%Y%m%d-%H:%M)"
DEBIAN_DATE="$(date +%Y%m%d-%H:%M)"
- if [ "${LH_ARCHITECTURE}" = "i386" ]
+ if [ "${LB_ARCHITECTURE}" = "i386" ]
then
DEBIAN_TOOLS_HTML=" <P>\n <tt> \n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt> \n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
DEBIAN_TOOLS_TXT="/tools/ and /install/floppy/"
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 3ed330e..50ed781 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build iso binary image')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso)
IMAGE="binary.iso"
;;
@@ -55,7 +55,7 @@ Create_lockfile .lock
# Checking depends
Check_package chroot/usr/bin/genisoimage genisoimage
-if [ "${LH_BINARY_IMAGES}" = "iso-hybrid" ]
+if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
then
Check_package chroot/usr/bin/isohybrid syslinux
fi
@@ -86,28 +86,28 @@ then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
fi
-if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
+if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
fi
-if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
+if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\""
fi
-if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
+if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
fi
-if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
+if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi
# Handle genisoimage architecture specific options
-case "${LH_BOOTLOADER}" in
+case "${LB_BOOTLOADER}" in
grub)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
@@ -145,15 +145,15 @@ case "${LH_BOOTLOADER}" in
;;
esac
-if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
+if In_list "stripped minimal" "${LB_PACKAGES_LISTS}"
then
- if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+ if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
fi
fi
-if [ "${LH_BOOTLOADER}" = "grub2" ]
+if [ "${LB_BOOTLOADER}" = "grub2" ]
then
cat > binary.sh << EOF
@@ -190,7 +190,7 @@ cat >> binary.sh << EOF
genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
EOF
-if [ "${LH_BINARY_IMAGES}" = "iso-hybrid" ]
+if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
then
cat >> binary.sh << EOF
@@ -200,7 +200,7 @@ EOF
fi
-case "${LH_BUILD_WITH_CHROOT}" in
+case "${LB_BUILD_WITH_CHROOT}" in
true)
# Moving image
mv binary.sh chroot
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index e6b1629..729b160 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install linux-image into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
then
exit 0
fi
@@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
DESTDIR="binary/casper"
;;
@@ -57,7 +57,7 @@ case "${LH_INITRAMFS}" in
;;
esac
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
powerpc)
LINUX="vmlinux"
;;
@@ -76,7 +76,7 @@ mkdir -p "${DESTDIR}"
cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
cp chroot/boot/initrd.img-* "${DESTDIR}"
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
live-initramfs|live-boot)
if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ]
then
diff --git a/scripts/build/binary_local-hooks b/scripts/build/binary_local-hooks
index d9da528..50aaae2 100755
--- a/scripts/build/binary_local-hooks
+++ b/scripts/build/binary_local-hooks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local hooks in binary')"
diff --git a/scripts/build/binary_local-includes b/scripts/build/binary_local-includes
index aa645e9..2fee3e4 100755
--- a/scripts/build/binary_local-includes
+++ b/scripts/build/binary_local-includes
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy files into binary')"
@@ -46,7 +46,7 @@ then
cd "${OLDPWD}"
# Removing symlinks
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
usb*)
find binary -type l | xargs rm -f
;;
diff --git a/scripts/build/binary_local-packageslists b/scripts/build/binary_local-packageslists
index 9fc13e6..f98742a 100755
--- a/scripts/build/binary_local-packageslists
+++ b/scripts/build/binary_local-packageslists
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install local packages into binary')"
@@ -108,9 +108,9 @@ then
do
SECTION="$(basename ${SECTION})"
- mkdir -p dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}
- apt-ftparchive packages pool/${SECTION} > dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages
- gzip -9 -c dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages.gz
+ mkdir -p dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}
+ apt-ftparchive packages pool/${SECTION} > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages
+ gzip -9 -c dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages.gz
done
cd "${OLDPWD}"
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index 2c57cfd..1c50f58 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'create manifest')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
then
exit 0
fi
@@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
SUFFIX="manifest"
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index a1dad45..01b301d 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs a memtest into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "false" ] || [ "${LH_MEMTEST}" = "none" ]
+if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ]
then
exit 0
fi
@@ -43,13 +43,13 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LH_ARCHITECTURE}" != "amd64" ] && [ "${LH_ARCHITECTURE}" != "i386" ]
+if [ "${LB_ARCHITECTURE}" != "amd64" ] && [ "${LB_ARCHITECTURE}" != "i386" ]
then
Echo_warning "skipping binary_memtest, foreign architecture."
exit 0
fi
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ]
@@ -62,7 +62,7 @@ then
fi
# Checking depends
-case "${LH_MEMTEST}" in
+case "${LB_MEMTEST}" in
memtest86)
Check_package chroot/boot/memtest86.bin memtest86
;;
@@ -79,7 +79,7 @@ Restore_cache cache/packages_binary
Install_package
# Setting destination directory
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
DESTDIR="binary/casper"
;;
@@ -95,13 +95,13 @@ Check_multiarchitecture
mkdir -p "${DESTDIR}"
# Installing memtest
-case "${LH_BUILD_WITH_CHROOT}" in
+case "${LB_BUILD_WITH_CHROOT}" in
true)
- cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
+ cp chroot/boot/${LB_MEMTEST}.bin "${DESTDIR}"/memtest
;;
false)
- cp /boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
+ cp /boot/${LB_MEMTEST}.bin "${DESTDIR}"/memtest
;;
esac
diff --git a/scripts/build/binary_net b/scripts/build/binary_net
index 6f7f94b..077a023 100755
--- a/scripts/build/binary_net
+++ b/scripts/build/binary_net
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build netboot binary image')"
@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if ! In_list net "${LH_BINARY_IMAGES}"
+if ! In_list net "${LB_BINARY_IMAGES}"
then
exit 0
fi
-if [ "${LH_NET_TARBALL}" = "none" ]
+if [ "${LB_NET_TARBALL}" = "none" ]
then
exit 0
fi
@@ -48,7 +48,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LH_ARCHITECTURE}" = "sparc" ]
+if [ "${LB_ARCHITECTURE}" = "sparc" ]
then
# Checking depends
Check_package chroot/usr/bin/elftoaout sparc-utils
@@ -61,7 +61,7 @@ then
# Set target and source directories
DESTDIR="tftpboot"
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
ORIGDIR="binary/casper"
;;
@@ -72,7 +72,7 @@ then
esac
# Find defaults
- DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+ DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
DEFAULT_MAP="$(echo chroot/boot/System.map-*${DEFAULT_FLAVOUR})"
@@ -120,7 +120,7 @@ rm -f binary-net.tar.gz
rm -f binary-net.tar
# Creating image file
-ROOT_DIR=$(basename ${LH_NET_ROOT_PATH})
+ROOT_DIR=$(basename ${LB_NET_ROOT_PATH})
if [ "${ROOT_DIR}" = "chroot" ]
then
mv chroot chroot.tmp
@@ -135,7 +135,7 @@ mkdir binary.tmp
mv ${ROOT_DIR} tftpboot binary.tmp
cd binary.tmp
-case "${LH_NET_TARBALL}" in
+case "${LB_NET_TARBALL}" in
bzip2)
tar cfj ../binary-net-tar.bz2 *
;;
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 65cec18..27af099 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build rootfs image')"
@@ -38,7 +38,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
LINUX="vmlinuz"
;;
@@ -48,7 +48,7 @@ case "${LH_ARCHITECTURE}" in
;;
esac
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
;;
@@ -61,7 +61,7 @@ esac
# Creating directory
mkdir -p binary/${INITFS}
-for STAGE in ${LH_CACHE_STAGES}
+for STAGE in ${LB_CACHE_STAGES}
do
if [ "${STAGE}" = "rootfs" ] && [ -d cache/stages_rootfs ]
then
@@ -70,11 +70,11 @@ do
# Restoring old cache
mkdir -p binary/"${INITFS}"
- ${LH_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
+ ${LB_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary
fi
# Creating stage file
@@ -83,7 +83,7 @@ do
fi
done
-case "${LH_CHROOT_FILESYSTEM}" in
+case "${LB_CHROOT_FILESYSTEM}" in
ext2|ext3)
# Checking depends
Check_package chroot/usr/bin/genext2fs genext2fs
@@ -95,24 +95,24 @@ case "${LH_CHROOT_FILESYSTEM}" in
Install_package
# Remove old image
- if [ -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} ]
+ if [ -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} ]
then
- rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+ rm -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
fi
DU_DIM="$(du -ks chroot/chroot | cut -f1)"
- REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_CHROOT_FILESYSTEM})"
+ REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_CHROOT_FILESYSTEM})"
RESERVED_PERCENTAGE="--reserved-percentage"
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
- Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
+ Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LB_CHROOT_FILESYSTEM}"
# Move image
- mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
+ mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
@@ -166,7 +166,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
;;
false)
- genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+ genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
;;
esac
@@ -190,12 +190,12 @@ case "${LH_CHROOT_FILESYSTEM}" in
rm -f binary/${INITFS}/filesystem.jffs2
fi
- if [ -n "${LH_JFFS2_ERASEBLOCK}" ]
+ if [ -n "${LB_JFFS2_ERASEBLOCK}" ]
then
- JFFS2_OPTIONS="--eraseblock=${LH_JFFS2_ERASEBLOCK}"
+ JFFS2_OPTIONS="--eraseblock=${LB_JFFS2_ERASEBLOCK}"
fi
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2"
@@ -264,7 +264,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
rm -rf binary/${INITFS}/filesystem.dir
fi
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
mv chroot/chroot binary/${INITFS}/filesystem.dir
;;
@@ -310,20 +310,20 @@ case "${LH_CHROOT_FILESYSTEM}" in
cp config/binary_rootfs/squashfs.sort chroot #FIXME
fi
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
# Create image
Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
# Move image
- ${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
- ${LH_ROOT_COMMAND} rm -f chroot/squashfs.sort
+ ${LB_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
+ ${LB_ROOT_COMMAND} rm -f chroot/squashfs.sort
if [ -e chroot/chroot.cache ]
then
@@ -371,13 +371,13 @@ case "${LH_CHROOT_FILESYSTEM}" in
Remove_package
fi
- ${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs
+ ${LB_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs
;;
false)
mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
@@ -385,9 +385,9 @@ case "${LH_CHROOT_FILESYSTEM}" in
;;
esac
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary/${INITFS}
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary/${INITFS}
fi
# Saving cache
@@ -400,7 +400,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
rm -rf binary
fi
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
mv chroot/chroot binary
;;
@@ -414,7 +414,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
esac
-for STAGE in ${LH_CACHE_STAGES}
+for STAGE in ${LB_CACHE_STAGES}
do
if [ "${STAGE}" = "rootfs" ]
then
@@ -422,14 +422,14 @@ do
mkdir -p cache/stages_rootfs
- if [ "${LH_CHROOT_FILESYSTEM}" != "none" ]
+ if [ "${LB_CHROOT_FILESYSTEM}" != "none" ]
then
- ${LH_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
+ ${LB_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
fi
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_rootfs
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_rootfs
fi
fi
done
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
index b187c2c..acc62ff 100755
--- a/scripts/build/binary_silo
+++ b/scripts/build/binary_silo
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs silo into binary')"
@@ -24,13 +24,13 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTLOADER}" != "silo" ]
+if [ "${LB_BOOTLOADER}" != "silo" ]
then
exit 0
fi
# Check image type
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*|usb*|tar)
;;
@@ -82,7 +82,7 @@ Silo_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\t label=${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\t initrd=${DIRECTORY}/${INITRD}\n"
- LINUX_LIVE="${LINUX_LIVE}\t append=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
+ LINUX_LIVE="${LINUX_LIVE}\t append=\"boot=${INITFS} live-config LB_BOOTAPPEND_LIVE ${APPEND}\"\n"
}
Silo_install_entry ()
@@ -102,12 +102,12 @@ Silo_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\t label=${LABEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\t initrd=${DIRECTORY}/${INITRD}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\t append=\"LH_BOOTAPPEND_LIVE ${APPEND} LH_BOOTAPPEND_INSTALL\"\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\t append=\"LB_BOOTAPPEND_LIVE ${APPEND} LB_BOOTAPPEND_INSTALL\"\n"
}
# Setting destination directories
DESTDIR_INSTALL="binary/install"
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
DESTDIR_LIVE="binary/casper"
@@ -123,63 +123,63 @@ esac
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-case "${LH_ENCRYPTION}" in
+case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}"
;;
esac
-if [ -n "${LH_USERNAME}" ]
+if [ -n "${LB_USERNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_USERNAME}" != "user" ]
+ if [ "${LB_USERNAME}" != "user" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LH_HOSTNAME}" ]
+if [ -n "${LB_HOSTNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_HOSTNAME}" != "debian" ]
+ if [ "${LB_HOSTNAME}" != "debian" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ -n "${LH_NET_COW_PATH}" ]
+if [ -n "${LB_NET_COW_PATH}" ]
then
Echo_error "Net cow not supported on silo"
exit 1
fi
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
+if [ "${LB_EXPOSED_ROOT}" != "false" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
+LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
@@ -187,14 +187,14 @@ FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
Silo_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
+if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinuz-*
do
@@ -210,7 +210,7 @@ fi
LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
@@ -225,12 +225,12 @@ fi
LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*|usb*)
# Copying silo
mkdir -p binary/boot
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp chroot/boot/second.b binary/boot
;;
@@ -242,7 +242,7 @@ case "${LH_BINARY_IMAGES}" in
cp -r "${TEMPLATES}"/* binary/boot
- if [ "${LH_DEBIAN_INSTALLER}" = "false" ]
+ if [ "${LB_DEBIAN_INSTALLER}" = "false" ]
then
rm -f binary/boot/debian.txt.install
else
@@ -253,12 +253,12 @@ case "${LH_BINARY_IMAGES}" in
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" \
-e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
binary/boot/silo.conf
- sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" \
- -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" \
+ sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" \
+ -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" \
binary/boot/silo.conf
- sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" \
- -e "s|LH_VERSION|${VERSION}|" \
- -e "s|LH_DISTRIBUTION|${LH_DISTRIBUTION}|" \
+ sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" \
+ -e "s|LB_VERSION|${VERSION}|" \
+ -e "s|LB_DISTRIBUTION|${LB_DISTRIBUTION}|" \
binary/boot/debian.txt
;;
esac
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index ae74641..8e28634 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs syslinux into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTLOADER}" != "syslinux" ]
+if [ "${LB_BOOTLOADER}" != "syslinux" ]
then
exit 0
fi
@@ -90,7 +90,7 @@ Syslinux_live_entry ()
INITRD="${4}"
APPEND="${5}"
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
iso*|usb*)
NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
NUMBER="$((${NUMBER} +1))"
@@ -127,7 +127,7 @@ Syslinux_live_entry ()
fi
LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
+ LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LB_BOOTAPPEND_LIVE} ${APPEND}\n"
# Failsafe kernel
LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"
@@ -139,7 +139,7 @@ Syslinux_live_entry ()
fi
LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
+ LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LB_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
}
Syslinux_install_entry ()
@@ -184,7 +184,7 @@ Syslinux_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\nlabel $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tmenu label ${LABEL} ${TYPE}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LB_BOOTAPPEND_INSTALL}\n"
done
}
@@ -192,13 +192,13 @@ Copy_syslinux_templates ()
{
cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH}
- if [ "${LH_SYSLINUX_MENU}" = "false" ]
+ if [ "${LB_SYSLINUX_MENU}" = "false" ]
then
cp -r "${TEMPLATES}"/normal/* ${SCREEN_PATH}
else
cp -r "${TEMPLATES}"/menu/* ${SCREEN_PATH}
- case "${LH_SYSLINUX_MENU}" in
+ case "${LB_SYSLINUX_MENU}" in
gfxboot)
MENUMODULE="gfxboot.c32"
;;
@@ -212,16 +212,16 @@ Copy_syslinux_templates ()
;;
*)
- if [ -z "${LH_SYSLINUX_CFG}" ]
+ if [ -z "${LB_SYSLINUX_CFG}" ]
then
MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
else
- LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
+ LB_SYSLINUX_CFG="${LB_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
fi
;;
esac
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
;;
@@ -231,9 +231,9 @@ Copy_syslinux_templates ()
esac
fi
- if ls "${TEMPLATES}/${LH_LANGUAGE}"/* > /dev/null 2>&1
+ if ls "${TEMPLATES}/${LB_LANGUAGE}"/* > /dev/null 2>&1
then
- cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* ${SCREEN_PATH}
+ cp -r "${TEMPLATES}"/"${LB_LANGUAGE}"/* ${SCREEN_PATH}
else
if ls "${TEMPLATES}"/en/* > /dev/null 2>&1
then
@@ -249,7 +249,7 @@ Copy_syslinux_templates ()
done
fi
- if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+ if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1
then
@@ -259,7 +259,7 @@ Copy_syslinux_templates ()
done
fi
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386|powerpc)
if ls ${SCREEN_PATH}/*.install.g-i > /dev/null 2>&1
then
@@ -278,36 +278,36 @@ Copy_syslinux_templates ()
rm -f ${SCREEN_PATH}/*.install*
fi
- if [ "${LH_SYSLINUX_MENU}" != "false" ]
+ if [ "${LB_SYSLINUX_MENU}" != "false" ]
then
rm -f ${DATA_PATH}/boot.txt
fi
# Copying custom splash screen
- if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
+ if [ "${LB_SYSLINUX_SPLASH}" = "none" ]
then
# no splash screen
SPLASH=""
rm -f ${SCREEN_PATH}/splash.rle
rm -f ${DATA_PATH}/splash.png
else
- if [ "${LH_SYSLINUX_MENU}" = "false" ]
+ if [ "${LB_SYSLINUX_MENU}" = "false" ]
then
SPLASH="${LIVE_DATA_PATH}/splash.rle"
else
SPLASH="${LIVE_DATA_PATH}/splash.png"
fi
- if [ -n "${LH_SYSLINUX_SPLASH}" ]
+ if [ -n "${LB_SYSLINUX_SPLASH}" ]
then
- if [ ! -e "${LH_SYSLINUX_SPLASH}" ]
+ if [ ! -e "${LB_SYSLINUX_SPLASH}" ]
then
- Echo_error "%s doen't exist" "${LH_SYSLINUX_SPLASH}"
+ Echo_error "%s doen't exist" "${LB_SYSLINUX_SPLASH}"
exit 1
else
rm -f ${SCREEN_PATH}/splash.rle
rm -f ${DATA_PATH}/splash.png
- cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
+ cp -f "${LB_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
fi
fi
fi
@@ -326,15 +326,15 @@ Configure_syslinux_templates ()
-e "s|{\$LIVE_DATA_PATH}|${LIVE_DATA_PATH}|" \
-e "s|{\$LIVE_KERNEL_PATH}|${LIVE_KERNEL_PATH}|" \
-e "s|{\$SPLASH}|${SPLASH}|" \
- -e "s|{\$LH_DISTRIBUTION}|${LH_DISTRIBUTION}|" \
- -e "s|{\$LH_DATE}|$(date +%Y%m%d)|" \
- -e "s|{\$LH_MEDIA}|${MEDIA}|" \
- -e "s|{\$LH_VERSION}|${VERSION}|" \
- -e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
+ -e "s|{\$LB_DISTRIBUTION}|${LB_DISTRIBUTION}|" \
+ -e "s|{\$LB_DATE}|$(date +%Y%m%d)|" \
+ -e "s|{\$LB_MEDIA}|${MEDIA}|" \
+ -e "s|{\$LB_VERSION}|${VERSION}|" \
+ -e "s|{\$LB_SYSLINUX_TIMEOUT}|${LB_SYSLINUX_TIMEOUT}0|" \
$template_file
done
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
usb*)
if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
then
@@ -352,7 +352,7 @@ Configure_syslinux_templates ()
}
# Setting up common variables
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
;;
@@ -363,7 +363,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting boot method specific variables
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*)
SYSLINUX_PATH="binary/isolinux"
KERNEL_PATH="binary/${INITFS}"
@@ -378,12 +378,12 @@ case "${LH_BINARY_IMAGES}" in
net)
SYSLINUX_PATH="tftpboot"
- KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}"
- SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens"
+ KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LB_ARCHITECTURE}"
+ SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LB_ARCHITECTURE}/boot-screens"
DATA_PATH="${SCREEN_PATH}"
- LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}"
- LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}"
- LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens"
+ LIVE_KERNEL_PATH="debian-live/${LB_ARCHITECTURE}"
+ LIVE_INSTALL_KERNEL_PATH="debian-install/${LB_ARCHITECTURE}"
+ LIVE_SCREEN_PATH="debian-live/${LB_ARCHITECTURE}/boot-screens"
LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
MEDIA="netboot"
;;
@@ -409,65 +409,65 @@ mkdir -p "${SCREEN_PATH}"
mkdir -p "${DATA_PATH}"
# Setting boot parameters
-case "${LH_ENCRYPTION}" in
+case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}"
;;
esac
-if [ -n "${LH_USERNAME}" ]
+if [ -n "${LB_USERNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_USERNAME}" != "user" ]
+ if [ "${LB_USERNAME}" != "user" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LH_HOSTNAME}" ]
+if [ -n "${LB_HOSTNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_HOSTNAME}" != "debian" ]
+ if [ "${LB_HOSTNAME}" != "debian" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
+if [ "${LB_EXPOSED_ROOT}" != "false" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
fi
-if [ "${LH_BINARY_IMAGES}" = "net" ]
+if [ "${LB_BINARY_IMAGES}" = "net" ]
then
- case "${LH_NET_ROOT_FILESYSTEM}" in
+ case "${LB_NET_ROOT_FILESYSTEM}" in
nfs)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=nfs nfsroot=${LH_NET_ROOT_SERVER}:${LH_NET_ROOT_PATH}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} netboot=nfs nfsroot=${LB_NET_ROOT_SERVER}:${LB_NET_ROOT_PATH}"
;;
cifs)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=cifs nfsroot=//${LH_NET_ROOT_SERVER}${LH_NET_ROOT_PATH}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} netboot=cifs nfsroot=//${LB_NET_ROOT_SERVER}${LB_NET_ROOT_PATH}"
;;
*)
@@ -476,22 +476,22 @@ then
;;
esac
- if [ -n "${LH_NET_ROOT_MOUNTOPTIONS}" ]
+ if [ -n "${LB_NET_ROOT_MOUNTOPTIONS}" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfsopts=${LH_NET_ROOT_MOUNTOPTIONS}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} nfsopts=${LB_NET_ROOT_MOUNTOPTIONS}"
fi
fi
-if [ -n "${LH_NET_COW_PATH}" ]
+if [ -n "${LB_NET_COW_PATH}" ]
then
- case "${LH_NET_COW_FILESYSTEM}" in
+ case "${LB_NET_COW_FILESYSTEM}" in
nfs)
- if [ -n "${LH_NET_COW_MOUNTOPTIONS}" ]
+ if [ -n "${LB_NET_COW_MOUNTOPTIONS}" ]
then
- LH_NET_COW_MOUNTOPTIONS=",${LH_NET_COW_MOUNTOPTIONS}"
+ LB_NET_COW_MOUNTOPTIONS=",${LB_NET_COW_MOUNTOPTIONS}"
fi
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfscow=${LH_NET_COW_SERVER}:${LH_NET_COW_PATH}${LH_NET_COW_MOUNTOPTIONS}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} nfscow=${LB_NET_COW_SERVER}:${LB_NET_COW_PATH}${LB_NET_COW_MOUNTOPTIONS}"
;;
*)
@@ -501,7 +501,7 @@ then
esac
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
+LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
@@ -512,34 +512,34 @@ then
mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH}
mv binary/${INITFS}/initrd* ${KERNEL_PATH}
- if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
+ if [ "${LB_MEMTEST}" != "false" ] && [ "${LB_MEMTEST}" != "none" ]
then
mv binary/${INITFS}/memtest ${KERNEL_PATH}
fi
fi
# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-Syslinux_live_entry "live" "${LH_SYSLINUX_MENU_LIVE_ENTRY}" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+Syslinux_live_entry "live" "${LB_SYSLINUX_MENU_LIVE_ENTRY}" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
+if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
then
- for FLAVOUR in ${LH_LINUX_FLAVOURS}
+ for FLAVOUR in ${LB_LINUX_FLAVOURS}
do
if [ "${FLAVOUR}" != "${DEFAULT_FLAVOUR}" ]
then
FLAVOUR_KERNEL="$(basename chroot/boot/vmlinuz-*${FLAVOUR})"
FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e 's|vmlinuz-||')"
- Syslinux_live_entry "live-${FLAVOUR}" "${LH_SYSLINUX_MENU_LIVE_ENTRY} ${FLAVOUR}" "${FLAVOUR_KERNEL}" "${FLAVOUR_INITRD}"
+ Syslinux_live_entry "live-${FLAVOUR}" "${LB_SYSLINUX_MENU_LIVE_ENTRY} ${FLAVOUR}" "${FLAVOUR_KERNEL}" "${FLAVOUR_INITRD}"
fi
done
fi
# Only needed for non-vesamenu, non-gfxboot syslinux
-case "${LH_SYSLINUX_MENU}" in
+case "${LB_SYSLINUX_MENU}" in
false|menu)
# Adding syslinux hardcoded default label entry
Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
@@ -547,7 +547,7 @@ case "${LH_SYSLINUX_MENU}" in
esac
# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
@@ -571,7 +571,7 @@ fi
# Assembling memtest configuration
if [ -f "${KERNEL_PATH}"/memtest ]
then
- Syslinux_memtest_entry "memtest" "${LH_SYSLINUX_MENU_MEMTEST_ENTRY}" "memtest"
+ Syslinux_memtest_entry "memtest" "${LB_SYSLINUX_MENU_MEMTEST_ENTRY}" "memtest"
fi
# Copy templates to base syslinux directory
@@ -581,9 +581,9 @@ Copy_syslinux_templates
Configure_syslinux_templates
# Configure syslinux setup per boot method
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*)
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
;;
@@ -595,14 +595,14 @@ case "${LH_BINARY_IMAGES}" in
mv ${SCREEN_PATH}/syslinux.cfg ${SCREEN_PATH}/isolinux.cfg
# Copying configuration file
- if [ -n "${LH_SYSLINUX_CFG}" ]
+ if [ -n "${LB_SYSLINUX_CFG}" ]
then
- cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/isolinux.cfg
+ cp "${LB_SYSLINUX_CFG}" ${SCREEN_PATH}/isolinux.cfg
fi
;;
net)
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp chroot/usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
;;
@@ -626,14 +626,14 @@ case "${LH_BINARY_IMAGES}" in
mv ${SCREEN_PATH}/syslinux.cfg ${KERNEL_PATH}/pxelinux.cfg/default
# Copying configuration file
- if [ -n "${LH_SYSLINUX_CFG}" ]
+ if [ -n "${LB_SYSLINUX_CFG}" ]
then
- cp "${LH_SYSLINUX_CFG}" ${KERNEL_PATH}/pxelinux.cfg/default
+ cp "${LB_SYSLINUX_CFG}" ${KERNEL_PATH}/pxelinux.cfg/default
fi
;;
usb*|tar)
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
;;
@@ -643,9 +643,9 @@ case "${LH_BINARY_IMAGES}" in
esac
# Copying configuration file
- if [ -n "${LH_SYSLINUX_CFG}" ]
+ if [ -n "${LB_SYSLINUX_CFG}" ]
then
- cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/syslinux.cfg
+ cp "${LB_SYSLINUX_CFG}" ${SCREEN_PATH}/syslinux.cfg
fi
;;
esac
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index 197ceb7..3e89bd7 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build harddisk binary image')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if ! In_list tar "${LH_BINARY_IMAGES}"
+if ! In_list tar "${LB_BINARY_IMAGES}"
then
exit 0
fi
diff --git a/scripts/build/binary_usb b/scripts/build/binary_usb
index 9560439..ae78e7b 100755
--- a/scripts/build/binary_usb
+++ b/scripts/build/binary_usb
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary image')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if ! In_list usb-hdd "${LH_BINARY_IMAGES}"
+if ! In_list usb-hdd "${LB_BINARY_IMAGES}"
then
exit 0
fi
@@ -48,9 +48,9 @@ Check_package chroot/sbin/mkdosfs dosfstools
Check_package chroot/usr/share/doc/mtools mtools
Check_package chroot/sbin/parted parted
-if [ "${LH_ARCHITECTURE}" = "sparc" ]
+if [ "${LB_ARCHITECTURE}" = "sparc" ]
then
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
Check_package chroot/sbin/mkfs.ext2 e2fsprogs
;;
@@ -62,7 +62,7 @@ then
esac
fi
-case "${LH_BOOTLOADER}" in
+case "${LB_BOOTLOADER}" in
grub)
Check_package chroot/usr/sbin/grub grub
;;
@@ -85,28 +85,28 @@ then
fi
# Enforce fat32 if we find individual files bigger than 2GB
-if [ "${LH_BINARY_FILESYSTEM}" = "fat16" ] && [ -n "$(find binary -size +1999M)" ]
+if [ "${LB_BINARY_FILESYSTEM}" = "fat16" ] && [ -n "$(find binary -size +1999M)" ]
then
Echo_warning "FAT16 doesn't support files larger than 2GB, automatically enforcing FAT32."
- LH_BINARY_FILESYSTEM="fat32"
- export LH_BINARY_FILESYSTEM
+ LB_BINARY_FILESYSTEM="fat32"
+ export LB_BINARY_FILESYSTEM
fi
# Enforce fat32 if we have images in total bigger than 2GB
-if [ "${LH_BINARY_FILESYSTEM}" = "fat16" ] && [ "$(du -s binary | awk '{ print $1 }')" -gt "1900000" ]
+if [ "${LB_BINARY_FILESYSTEM}" = "fat16" ] && [ "$(du -s binary | awk '{ print $1 }')" -gt "1900000" ]
then
Echo_warning "FAT16 doesn't support partitions larger than 2GB, automatically enforcing FAT32"
- LH_BINARY_FILESYSTEM="fat32"
- export LH_BINARY_FILESYSTEM
+ LB_BINARY_FILESYSTEM="fat32"
+ export LB_BINARY_FILESYSTEM
fi
# Everything which comes here needs to be cleaned up,
DU_DIM="$(du -ms binary | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
+REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})"
dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM}
-FREELO="$(${LH_LOSETUP} -f)"
+FREELO="$(${LB_LOSETUP} -f)"
if [ ! -b chroot/${FREELO} ]
then
MAKEDEV="true"
@@ -118,7 +118,7 @@ fi
echo "!!! The following error/warning messages can be ignored !!!"
Losetup $FREELO chroot/binary.img 0
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
sparc)
PARTITION_TABLE_TYPE="sun"
;;
@@ -127,29 +127,29 @@ case "${LH_ARCHITECTURE}" in
;;
esac
-case "${LH_BINARY_FILESYSTEM}" in
+case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
PARTITION_TYPE="ext2"
;;
fat16|fat32)
- PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
+ PARTITION_TYPE="${LB_BINARY_FILESYSTEM}"
;;
*)
- Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
+ Echo_error "Unsupported binary filesystem %s" "${LB_BINARY_FILESYSTEM}"
exit 1
;;
esac
-case "${LH_BUILD_WITH_CHROOT}" in
+case "${LB_BUILD_WITH_CHROOT}" in
true)
Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
- if [ "${LH_BOOTLOADER}" = "syslinux" ]
+ if [ "${LB_BOOTLOADER}" = "syslinux" ]
then
dd if=chroot/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
fi
@@ -161,7 +161,7 @@ case "${LH_BUILD_WITH_CHROOT}" in
parted -s ${FREELO} set 1 boot on || true
parted -s ${FREELO} set 1 lba off || true
- if [ "${LH_BOOTLOADER}" = "syslinux" ]
+ if [ "${LB_BOOTLOADER}" = "syslinux" ]
then
dd if=/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
fi
@@ -169,14 +169,14 @@ case "${LH_BUILD_WITH_CHROOT}" in
esac
sleep 1
-${LH_LOSETUP} -d ${FREELO}
+${LB_LOSETUP} -d ${FREELO}
-FREELO="$(${LH_LOSETUP} -f)"
+FREELO="$(${LB_LOSETUP} -f)"
Losetup $FREELO chroot/binary.img 1
-case "${LH_BINARY_FILESYSTEM}" in
+case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
- MKFS="${LH_BINARY_FILESYSTEM}"
+ MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
;;
@@ -191,7 +191,7 @@ case "${LH_BINARY_FILESYSTEM}" in
;;
esac
-case "${LH_BUILD_WITH_CHROOT}" in
+case "${LB_BUILD_WITH_CHROOT}" in
true)
Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
;;
@@ -201,19 +201,19 @@ case "${LH_BUILD_WITH_CHROOT}" in
;;
esac
-case "${LH_BINARY_FILESYSTEM}" in
+case "${LB_BINARY_FILESYSTEM}" in
fat*)
CP_OPTIONS="-L"
;;
esac
mkdir -p chroot/binary.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
+${LB_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
cp -r -T ${CP_OPTIONS} binary/ chroot/binary.tmp
FIXME()
{
-if [ "${LH_BOOTLOADER}" = "grub" ]
+if [ "${LB_BOOTLOADER}" = "grub" ]
then
cat > chroot/grub.sh << EOF
@@ -242,12 +242,12 @@ EOF
fi
}
-${LH_ROOT_COMMAND} umount chroot/binary.tmp
+${LB_ROOT_COMMAND} umount chroot/binary.tmp
rmdir chroot/binary.tmp
-if [ "${LH_BOOTLOADER}" = "syslinux" ]
+if [ "${LB_BOOTLOADER}" = "syslinux" ]
then
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
Chroot chroot "syslinux ${FREELO}"
;;
@@ -259,7 +259,7 @@ then
fi
sleep 1
-${LH_LOSETUP} -d ${FREELO}
+${LB_LOSETUP} -d ${FREELO}
echo "!!! The above error/warning messages can be ignored !!!"
diff --git a/scripts/build/binary_virtual-hdd b/scripts/build/binary_virtual-hdd
index 4d16588..c2bc5db 100755
--- a/scripts/build/binary_virtual-hdd
+++ b/scripts/build/binary_virtual-hdd
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build binary image')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if ! In_list virtual-hdd "${LH_BINARY_IMAGES}"
+if ! In_list virtual-hdd "${LB_BINARY_IMAGES}"
then
exit 0
fi
@@ -43,9 +43,9 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
Check_package chroot/sbin/mkfs.ext2 e2fsprogs
;;
@@ -65,9 +65,9 @@ then
fi
Echo_message "Creating virtual disk image..."
-dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LH_VIRTUAL_ROOT_SIZE}
+dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LB_VIRTUAL_ROOT_SIZE}
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
mv binary-virtual.img chroot
@@ -78,7 +78,7 @@ then
Chroot chroot "ln -s /proc/mounts /etc/mtab"
fi
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2)
Chroot chroot "mkfs.ext2 -F binary-virtual.img"
;;
@@ -90,7 +90,7 @@ then
mv chroot/binary-virtual.img ./
else
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2)
mkfs.ext2 -F binary-virtual.img
;;
@@ -102,11 +102,11 @@ else
fi
mkdir -p binary.tmp
-${LH_ROOT_COMMAND} mount -o loop binary-virtual.img binary.tmp
+${LB_ROOT_COMMAND} mount -o loop binary-virtual.img binary.tmp
cp -a binary/* binary.tmp
cp -af binary/.disk* binary.tmp
-${LH_ROOT_COMMAND} umount binary.tmp
+${LB_ROOT_COMMAND} umount binary.tmp
rmdir binary.tmp
# Saving cache
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 3a17dbd..7eb86a6 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy win32-loader into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_WIN32_LOADER}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_WIN32_LOADER}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
then
exit 0
fi
@@ -43,9 +43,9 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny|squeeze)
WIN32_LOADER="/usr/lib/win32-loader"
;;
@@ -55,7 +55,7 @@ case "${LH_ARCHITECTURE}" in
;;
esac
- if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+ if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Checking depends
Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader
@@ -79,12 +79,12 @@ case "${LH_ARCHITECTURE}" in
mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
fi
- if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+ if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
cat > binary/win32-loader.ini << EOF
[installer]
-arch=${LH_ARCHITECTURE}
+arch=${LB_ARCHITECTURE}
i386/linux=install/vmlinuz
i386/initrd=install/initrd.gz
i386/gtk/linux=install/vmlinuz
diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot
index 4ba0b27..44b0bde 100755
--- a/scripts/build/binary_yaboot
+++ b/scripts/build/binary_yaboot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs yaboot into binary')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTLOADER}" != "yaboot" ]
+if [ "${LB_BOOTLOADER}" != "yaboot" ]
then
exit 0
fi
@@ -72,7 +72,7 @@ Yaboot_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
- LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
+ LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LB_BOOTAPPEND_LIVE ${APPEND}\"\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
}
@@ -119,12 +119,12 @@ Yaboot_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${TYPE}${TYPE_SUFFIX}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
- LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\"\n"
+ LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LB_BOOTAPPEND_INSTALL}\"\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
done
}
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
INITFS="casper"
;;
@@ -135,9 +135,9 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*)
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
;;
@@ -162,63 +162,63 @@ Check_multiarchitecture
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
-case "${LH_ENCRYPTION}" in
+case "${LB_ENCRYPTION}" in
""|false)
;;
*)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}"
;;
esac
-if [ -n "${LH_USERNAME}" ]
+if [ -n "${LB_USERNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_USERNAME}" != "user" ]
+ if [ "${LB_USERNAME}" != "user" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
-if [ -n "${LH_HOSTNAME}" ]
+if [ -n "${LB_HOSTNAME}" ]
then
- case "${LH_INITRAMFS}" in
+ case "${LB_INITRAMFS}" in
casper)
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
;;
live-initramfs|live-boot)
- if [ "${LH_HOSTNAME}" != "debian" ]
+ if [ "${LB_HOSTNAME}" != "debian" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}"
fi
;;
esac
fi
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ -n "${LH_NET_COW_PATH}" ]
+if [ -n "${LB_NET_COW_PATH}" ]
then
Echo_error "Net cow not yet supported on yaboot"
exit 1
fi
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
+if [ "${LB_EXPOSED_ROOT}" != "false" ]
then
- LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
fi
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
+LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
@@ -226,14 +226,14 @@ FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
# Assembling kernel configuration
# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})"
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')"
Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
+if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinux-*
do
@@ -249,7 +249,7 @@ fi
LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then
VMLINUZ_DI="vmlinuz"
INITRD_DI="initrd.gz"
@@ -272,12 +272,12 @@ fi
LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
iso*|usb*)
# Copying yaboot
mkdir -p binary/yaboot
- case "${LH_BUILD_WITH_CHROOT}" in
+ case "${LB_BUILD_WITH_CHROOT}" in
true)
cp chroot/usr/lib/yaboot/yaboot binary/yaboot
;;
@@ -289,7 +289,7 @@ case "${LH_BINARY_IMAGES}" in
cp -r "${TEMPLATES}"/* binary/yaboot
- case "${LH_BINARY_IMAGES}" in
+ case "${LB_BINARY_IMAGES}" in
usb*)
mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
echo "root=/dev/ram" > binary/yaboot/yaboot.conf
@@ -300,8 +300,8 @@ case "${LH_BINARY_IMAGES}" in
# Configure yaboot templates
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf
- sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf
- sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" -e "s|LH_VERSION|${VERSION}|" binary/yaboot/boot.msg
+ sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf
+ sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" -e "s|LB_VERSION|${VERSION}|" binary/yaboot/boot.msg
;;
esac
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index 17370f6..0bd2585 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system')"
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache
index af902df..96cac17 100755
--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'cache bootstrap stage')"
@@ -29,7 +29,7 @@ Check_crossarchitecture
Echo_message "Begin caching bootstrap stage..."
-for STAGE in ${LH_CACHE_STAGES}
+for STAGE in ${LB_CACHE_STAGES}
do
if [ "${STAGE}" = "bootstrap" ]
then
@@ -50,11 +50,11 @@ do
rm -rf chroot
# Restoring old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+ ${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Creating stage file
@@ -79,11 +79,11 @@ do
mkdir -p cache
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+ ${LB_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap
fi
# Creating stage file
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
index 12800a7..d7724d7 100755
--- a/scripts/build/bootstrap_cdebootstrap
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ] && [ "${LH_BOOTSTRAP}" != "cdebootstrap-static" ]
+if [ "${LB_BOOTSTRAP}" != "cdebootstrap" ] && [ "${LB_BOOTSTRAP}" != "cdebootstrap-static" ]
then
exit 0
fi
@@ -34,7 +34,7 @@ Check_crossarchitecture
Echo_message "Begin bootstrapping system..."
-Check_package /usr/bin/${LH_BOOTSTRAP} cdebootstrap
+Check_package /usr/bin/${LB_BOOTSTRAP} cdebootstrap
# Ensure that a system is built as root
lb testroot
@@ -53,34 +53,34 @@ Create_lockfile .lock
mkdir -p chroot
# Setting cdebootstrap options
-if [ -n "${LH_ARCHITECTURE}" ]
+if [ -n "${LB_ARCHITECTURE}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LH_ARCHITECTURE}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}"
fi
-if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
+if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LH_BOOTSTRAP_CONFIG}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LB_BOOTSTRAP_CONFIG}"
fi
-if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
+if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')"
fi
-if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
+if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')"
fi
-if [ -n "${LH_BOOTSTRAP_KEYRING}" ]
+if [ -n "${LB_BOOTSTRAP_KEYRING}" ]
then
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
fi
-if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
+if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
then
- case "${LH_PACKAGES_LISTS}" in
+ case "${LB_PACKAGES_LISTS}" in
stripped|minimal)
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
;;
@@ -89,13 +89,13 @@ then
;;
esac
else
- case "${LH_BOOTSTRAP_FLAVOUR}" in
+ case "${LB_BOOTSTRAP_FLAVOUR}" in
stripped|minimal)
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
;;
*)
- CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LH_BOOTSTRAP_FLAVOUR}"
+ CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}"
;;
esac
fi
@@ -115,14 +115,14 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
fi
-if [ "${LH_APT_SECURE}" = "false" ]
+if [ "${LB_APT_SECURE}" = "false" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated"
fi
if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
then
- if [ "${LH_CACHE_PACKAGES}" = "true" ]
+ if [ "${LB_CACHE_PACKAGES}" = "true" ]
then
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
@@ -130,12 +130,12 @@ then
cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
fi
- Echo_breakage "Running ${LH_BOOTSTRAP} (download-only)... "
- ${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+ Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... "
+ ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Removing old cache
@@ -146,16 +146,16 @@ then
cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
fi
- Echo_breakage "Running ${LH_BOOTSTRAP}... "
- ${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+ Echo_breakage "Running ${LB_BOOTSTRAP}... "
+ ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
- case "${LH_PACKAGES_LISTS}" in
+ case "${LB_PACKAGES_LISTS}" in
stripped|minimal)
Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
;;
@@ -172,6 +172,6 @@ then
# Creating stage file
Create_stagefile .stage/bootstrap
else
- Echo_error "Can't process file /usr/bin/${LH_BOOTSTRAP} (FIXME)"
+ Echo_error "Can't process file /usr/bin/${LB_BOOTSTRAP} (FIXME)"
exit 1
fi
diff --git a/scripts/build/bootstrap_copy b/scripts/build/bootstrap_copy
index 249b9c4..35d1378 100755
--- a/scripts/build/bootstrap_copy
+++ b/scripts/build/bootstrap_copy
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap by copying the host system')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTSTRAP}" != "copy" ]
+if [ "${LB_BOOTSTRAP}" != "copy" ]
then
exit 0
fi
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index 8176837..2e68a0e 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
+if [ "${LB_BOOTSTRAP}" != "debootstrap" ]
then
exit 0
fi
@@ -53,47 +53,47 @@ Create_lockfile .lock
mkdir -p chroot
# Setting debootstrap options
-if [ -n "${LH_ARCHITECTURE}" ]
+if [ -n "${LB_ARCHITECTURE}" ]
then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LB_ARCHITECTURE}"
fi
-if [ "${LH_ARCHIVE_AREAS}" != "main" ]
+if [ "${LB_ARCHIVE_AREAS}" != "main" ]
then
# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')"
fi
-if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
+if [ -n "${LB_BOOTSTRAP_CONFIG}" ]
then
if [ -d "/usr/share/debootstrap/scripts/" ]
then
- LH_DEBOOTSTRAP_SCRIPT="/usr/share/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+ LB_DEBOOTSTRAP_SCRIPT="/usr/share/debootstrap/scripts/${LB_BOOTSTRAP_CONFIG}"
else
- LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+ LB_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LB_BOOTSTRAP_CONFIG}"
fi
fi
-if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
+if [ -n "${LB_BOOTSTRAP_INCLUDE}" ]
then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')"
fi
-if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
+if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ]
then
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')"
fi
-if [ "${LH_USE_FAKEROOT}" != "true" ]
+if [ "${LB_USE_FAKEROOT}" != "true" ]
then
- if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
+ if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ]
then
- if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
+ if In_list "stripped minimal" "${LB_PACKAGES_LISTS}"
then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
fi
else
- case "${LH_BOOTSTRAP_FLAVOUR}" in
+ case "${LB_BOOTSTRAP_FLAVOUR}" in
stripped|minimal)
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
;;
@@ -101,7 +101,7 @@ then
;;
*)
- DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
esac
fi
else
@@ -115,7 +115,7 @@ fi
if [ -x "/usr/sbin/debootstrap" ]
then
- if [ "${LH_CACHE_PACKAGES}" = "true" ]
+ if [ "${LB_CACHE_PACKAGES}" = "true" ]
then
if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
then
@@ -124,11 +124,11 @@ then
fi
Echo_breakage "Running debootstrap (download-only)... "
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
+ ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Removing old cache
@@ -140,11 +140,11 @@ then
fi
Echo_breakage "Running debootstrap... "
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
+ ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Deconfiguring debootstrap configurations
diff --git a/scripts/build/build b/scripts/build/build
index c6720bf..0638629 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Automatically populating config tree
if [ -x auto/config ] && [ ! -e .stage/config ]
diff --git a/scripts/build/chroot b/scripts/build/chroot
index 470663e..b5baef4 100755
--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'customize the Debian system')"
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index 8ca2ad5..3a21525 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
@@ -43,19 +43,19 @@ case "${1}" in
mkdir -p chroot/etc/apt/apt.conf.d
# Configuring apt ftp proxy
- if [ -n "${LH_APT_FTP_PROXY}" ]
+ if [ -n "${LB_APT_FTP_PROXY}" ]
then
- echo "Acquire::ftp::Proxy \"${LH_APT_FTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
+ echo "Acquire::ftp::Proxy \"${LB_APT_FTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
fi
# Configuring apt http proxy
- if [ -n "${LH_APT_HTTP_PROXY}" ]
+ if [ -n "${LB_APT_HTTP_PROXY}" ]
then
- echo "Acquire::http::Proxy \"${LH_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
+ echo "Acquire::http::Proxy \"${LB_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
fi
# Configuring apt pdiffs
- case "${LH_APT_PDIFFS}" in
+ case "${LB_APT_PDIFFS}" in
true)
echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
;;
@@ -66,13 +66,13 @@ case "${1}" in
esac
# Configuring apt pipeline
- if [ -n "${LH_APT_PIPELINE}" ]
+ if [ -n "${LB_APT_PIPELINE}" ]
then
- echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+ echo "Acquire::http::Pipeline-Depth \"${LB_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
fi
# Configuring apt recommends
- case "${LH_APT_RECOMMENDS}" in
+ case "${LB_APT_RECOMMENDS}" in
true)
echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
@@ -85,7 +85,7 @@ case "${1}" in
esac
# Configuring apt secure
- case "${LH_APT_SECURE}" in
+ case "${LB_APT_SECURE}" in
true)
echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
@@ -164,7 +164,7 @@ case "${1}" in
rm -f chroot/etc/apt/apt.conf.d/00http-proxy
# Deconfiguring aptitude pdiffs
- if [ "${LH_APT_PDIFFS}" = "true" ]
+ if [ "${LB_APT_PDIFFS}" = "true" ]
then
rm -f chroot/etc/apt/apt.conf.d/00pdiffs
fi
@@ -173,13 +173,13 @@ case "${1}" in
rm -f chroot/etc/apt/apt.conf.d/00pipeline
# Deconfiguring aptitude recommends
- if [ "${LH_APT_RECOMMENDS}" = "true" ]
+ if [ "${LB_APT_RECOMMENDS}" = "true" ]
then
rm -f chroot/etc/apt/apt.conf.d/00recommends
fi
# Deconfiguring aptitude secure
- if [ "${LH_APT_SECURE}" = "true" ]
+ if [ "${LB_APT_SECURE}" = "true" ]
then
rm -f chroot/etc/apt/apt.conf.d/00secure
fi
diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache
index 4119705..5050b32 100755
--- a/scripts/build/chroot_cache
+++ b/scripts/build/chroot_cache
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'cache chroot stage')"
@@ -26,7 +26,7 @@ Set_defaults
Echo_message "Begin caching chroot stage..."
-for STAGE in ${LH_CACHE_STAGES}
+for STAGE in ${LB_CACHE_STAGES}
do
if [ "${STAGE}" = "chroot" ]
then
@@ -47,11 +47,11 @@ do
rm -rf chroot
# Restoring old cache
- ${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
+ ${LB_ROOT_COMMAND} cp -a cache/stages_chroot chroot
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
fi
# Creating stage file
@@ -75,11 +75,11 @@ do
mkdir -p cache
- ${LH_ROOT_COMMAND} cp -a chroot cache/stages_chroot
+ ${LB_ROOT_COMMAND} cp -a chroot cache/stages_chroot
- if [ -n "${LH_ROOT_COMMAND}" ]
+ if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_chroot
+ ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_chroot
fi
# Creating stage file
diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot
index ef5a525..dc05111 100755
--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts
index ef864f4..8e7e665 100755
--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /dev/pts')"
@@ -43,13 +43,13 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Creating mountpoint
mkdir -p chroot/dev/pts
# Mounting /dev/pts
- ${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts || true
+ ${LB_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts || true
fi
# Creating stage file
@@ -66,13 +66,13 @@ case "${1}" in
Create_lockfile .lock
# Unmounting /dev/pts
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/*
then
- ${LH_ROOT_COMMAND} umount chroot/dev/pts
+ ${LB_ROOT_COMMAND} umount chroot/dev/pts
else
- ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
fi
fi
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
index 78fc0fb..ec856ed 100755
--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
diff --git a/scripts/build/chroot_dpkg_tmpfs b/scripts/build/chroot_dpkg_tmpfs
index 2a9567c..db3b8bf 100755
--- a/scripts/build/chroot_dpkg_tmpfs
+++ b/scripts/build/chroot_dpkg_tmpfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /var/lib/dpkg')"
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index eb89021..c0052da 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hacks in chroot')"
@@ -38,9 +38,9 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_DISTRIBUTION}" in
+case "${LB_DISTRIBUTION}" in
squeeze|sid)
- if echo "${LH_TASKS}" | grep -qs lxde
+ if echo "${LB_TASKS}" | grep -qs lxde
then
GDM="gdm"
else
@@ -54,12 +54,12 @@ case "${LH_DISTRIBUTION}" in
esac
# Handling default desktop configuration
-for TASK in ${LH_TASKS}
+for TASK in ${LB_TASKS}
do
case "${TASK}" in
gnome-desktop)
# gnome is the only desktop environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
+ if [ -z "$(echo ${LB_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
@@ -75,7 +75,7 @@ do
kde-desktop)
# kde is the only desktop-environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e 's| desktop ||' | grep desktop)" ]
+ if [ -z "$(echo ${LB_TASKS} | sed -e 's|kde-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
@@ -94,7 +94,7 @@ do
lxde-desktop)
# lxde is the only desktop environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
+ if [ -z "$(echo ${LB_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
@@ -110,7 +110,7 @@ do
xfce-desktop)
# xfce is the only desktop environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
+ if [ -z "$(echo ${LB_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
@@ -134,7 +134,7 @@ done
# Removing udev mac caching rule
rm -f chroot/etc/udev/rules.d/*persistent-net.rules
-case "${LH_BINARY_IMAGES}" in
+case "${LB_BINARY_IMAGES}" in
net)
if [ ! -f chroot/usr/bin/smbmount ]
then
@@ -158,7 +158,7 @@ EOF
esac
# Update initramfs (always, because of udev rules in initrd)
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1"
;;
@@ -188,12 +188,12 @@ rm -f chroot/var/cache/debconf/*-old
rm -f chroot/var/lib/dpkg/*-old
rm -f chroot/var/log/apt/term.log
-if [ -n "${LH_ROOT_COMMAND}" ]
+if [ -n "${LB_ROOT_COMMAND}" ]
then
- ${LH_ROOT_COMMAND} chown -R --quiet $(whoami):$(whoami) chroot
+ ${LB_ROOT_COMMAND} chown -R --quiet $(whoami):$(whoami) chroot
fi
-case "${LH_INITRAMFS}" in
+case "${LB_INITRAMFS}" in
casper)
ID="999"
;;
@@ -203,12 +203,12 @@ case "${LH_INITRAMFS}" in
;;
esac
-if [ -d chroot/home/${LH_USERNAME} ]
+if [ -d chroot/home/${LB_USERNAME} ]
then
- chown -R --quiet ${ID}:${ID} chroot/home/${LH_USERNAME}
+ chown -R --quiet ${ID}:${ID} chroot/home/${LB_USERNAME}
fi
-if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# This is a temporary hack to get rid of fstab;
# needs cleanup in live-initramfs first to proper fix.
@@ -221,9 +221,9 @@ then
# packages lists. As a very cheap workaround, we ensure that the
# bootloader is already installed in the image. Very ugly, but it's to
# late to fix it in d-i because lenny rc2 has been already released.
- case "${LH_ARCHITECTURE}" in
+ case "${LB_ARCHITECTURE}" in
amd64|i386)
- case "${LH_BOOTLOADER}" in
+ case "${LB_BOOTLOADER}" in
grub)
Apt install grub
;;
@@ -240,7 +240,7 @@ then
esac
fi
-if [ "${LH_EXPOSED_ROOT}" = "true" ]
+if [ "${LB_EXPOSED_ROOT}" = "true" ]
then
# Make sure RW dirs exist so that the initramfs script has
# a directory in which to bind the tmpfs filesystems
diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks
index 14a99f7..ed40b18 100755
--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute hooks in chroot')"
@@ -39,14 +39,14 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing hooks
-HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' | sort -u)"
+HOOKS="$(echo ${LB_HOOKS} ${LB_PACKAGES_LISTS} ${LB_TASKS} | sed -e 's| |\n|g' | sort -u)"
for HOOK in ${HOOKS}
do
- if [ -f ${LH_BASE:-/usr/share/live/build}/hooks/"${HOOK}" ]
+ if [ -f ${LB_BASE:-/usr/share/live/build}/hooks/"${HOOK}" ]
then
# Copying hook
- cp ${LH_BASE:-/usr/share/live/build}/hooks/"${HOOK}" chroot/root
+ cp ${LB_BASE:-/usr/share/live/build}/hooks/"${HOOK}" chroot/root
# Making hook executable
if [ ! -x chroot/root/"${HOOK}" ]
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname
index 5389e71..a391099 100755
--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /bin/hostname')"
diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts
index 4a8f458..b8c50e7 100755
--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/hosts')"
diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages
index 96df6ad..8e1217e 100755
--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install queued packages into chroot')"
@@ -44,7 +44,7 @@ then
Restore_cache cache/packages_chroot
# Installing packages
- case "${LH_APT}" in
+ case "${LB_APT}" in
apt|apt-get)
Chroot chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install"
;;
diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive
index 398f2f1..82e5a6c 100755
--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'make build interactive')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_INTERACTIVE}" = "false" ]
+if [ "${LB_INTERACTIVE}" = "false" ]
then
exit 0
fi
@@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LH_INTERACTIVE}" in
+case "${LB_INTERACTIVE}" in
true|shell)
Echo_message "Pausing build: starting interactive shell..."
Chroot chroot "/bin/bash --login"
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index da8229f..507f385 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')"
@@ -54,27 +54,27 @@ warn_initrd = No
EOF
# Diverting update-initramfs
- #case "${LH_INITRAMFS}" in
+ #case "${LB_INITRAMFS}" in
# live-initramfs|live-boot)
# mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
# ;;
#esac
- if [ "${LH_LINUX_PACKAGES}" != "none" ]
+ if [ "${LB_LINUX_PACKAGES}" != "none" ]
then
- for FLAVOUR in ${LH_LINUX_FLAVOURS}
+ for FLAVOUR in ${LB_LINUX_FLAVOURS}
do
- for PACKAGE in ${LH_LINUX_PACKAGES}
+ for PACKAGE in ${LB_LINUX_PACKAGES}
do
echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
done
done
fi
- # Queue installation of linux-image and ${LH_INITRAMFS}
- if [ "${LH_INITRAMFS}" != "none" ]
+ # Queue installation of linux-image and ${LB_INITRAMFS}
+ if [ "${LB_INITRAMFS}" != "none" ]
then
- echo ${LH_INITRAMFS} >> chroot/root/chroot_packages
+ echo ${LB_INITRAMFS} >> chroot/root/chroot_packages
fi
# Creating stage file
diff --git a/scripts/build/chroot_local-hooks b/scripts/build/chroot_local-hooks
index 25e5af3..de65bba 100755
--- a/scripts/build/chroot_local-hooks
+++ b/scripts/build/chroot_local-hooks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local hooks in chroot')"
diff --git a/scripts/build/chroot_local-includes b/scripts/build/chroot_local-includes
index 9f2fdbe..78c19de 100755
--- a/scripts/build/chroot_local-includes
+++ b/scripts/build/chroot_local-includes
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy local files into chroot')"
diff --git a/scripts/build/chroot_local-packages b/scripts/build/chroot_local-packages
index 4e95a23..aa44179 100755
--- a/scripts/build/chroot_local-packages
+++ b/scripts/build/chroot_local-packages
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of local packages into chroot')"
diff --git a/scripts/build/chroot_local-packageslists b/scripts/build/chroot_local-packageslists
index 9efc5ef..ab7e5f2 100755
--- a/scripts/build/chroot_local-packageslists
+++ b/scripts/build/chroot_local-packageslists
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')"
diff --git a/scripts/build/chroot_local-patches b/scripts/build/chroot_local-patches
index c039311..da8b88e 100755
--- a/scripts/build/chroot_local-patches
+++ b/scripts/build/chroot_local-patches
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'apply local patches against chroot')"
diff --git a/scripts/build/chroot_local-preseed b/scripts/build/chroot_local-preseed
index 34f9b0a..fa259da 100755
--- a/scripts/build/chroot_local-preseed
+++ b/scripts/build/chroot_local-preseed
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute local preseed in chroot')"
diff --git a/scripts/build/chroot_localization b/scripts/build/chroot_localization
index 1a1dcf8..ffe3318 100755
--- a/scripts/build/chroot_localization
+++ b/scripts/build/chroot_localization
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install localization packages into chroot')"
@@ -39,9 +39,9 @@ Check_lockfile .lock
Create_lockfile .lock
# Setting localizations
-if [ -n "${LH_LANGUAGE}" ]
+if [ -n "${LB_LANGUAGE}" ]
then
- case "${LH_LANGUAGE}" in
+ case "${LB_LANGUAGE}" in
af)
# Afrikaans
LOCALIZATIONS="iceweasel kde openoffice"
@@ -593,12 +593,12 @@ then
esac
# Setting languages
- ICEAPE="${ICEAPE:-$LH_LANGUAGE}"
- ICEDOVE="${ICEDOVE:-$LH_LANGUAGE}"
- ICEWEASEL="${ICEWEASEL:-$LH_LANGUAGE}"
- KDE="${KDE:-$LH_LANGUAGE}"
- KOFFICE="${KOFFICE:-$LH_LANGUAGE}"
- OPENOFFICE="${OPENOFFICE:-$LH_LANGUAGE}"
+ ICEAPE="${ICEAPE:-$LB_LANGUAGE}"
+ ICEDOVE="${ICEDOVE:-$LB_LANGUAGE}"
+ ICEWEASEL="${ICEWEASEL:-$LB_LANGUAGE}"
+ KDE="${KDE:-$LB_LANGUAGE}"
+ KOFFICE="${KOFFICE:-$LB_LANGUAGE}"
+ OPENOFFICE="${OPENOFFICE:-$LB_LANGUAGE}"
# Setting packages
for LOCALIZATION in ${LOCALIZATIONS}
@@ -612,7 +612,7 @@ then
Check_installed chroot/usr/bin/icedove icedove
if [ $INSTALL_STATUS -eq 0 ]
then
- if [ "${LH_DISTRIBUTION}" = lenny ]
+ if [ "${LB_DISTRIBUTION}" = lenny ]
then
Check_package "" icedove-locale-"${ICEDOVE}"
else
@@ -639,7 +639,7 @@ then
esac
done
- if [ "${LH_DISTRIBUTION}" = "lenny" ]
+ if [ "${LB_DISTRIBUTION}" = "lenny" ]
then
Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
fi
diff --git a/scripts/build/chroot_packages b/scripts/build/chroot_packages
index 4ee477c..dbf873a 100755
--- a/scripts/build/chroot_packages
+++ b/scripts/build/chroot_packages
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of packages into chroot')"
@@ -38,9 +38,9 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LH_PACKAGES}" ] && [ "${LH_PACKAGES}" != "none" ]
+if [ -n "${LB_PACKAGES}" ] && [ "${LB_PACKAGES}" != "none" ]
then
- echo ${LH_PACKAGES} >> chroot/root/chroot_packages
+ echo ${LB_PACKAGES} >> chroot/root/chroot_packages
# Creating stage file
Create_stagefile .stage/chroot_packages
diff --git a/scripts/build/chroot_packageslists b/scripts/build/chroot_packageslists
index 9c3ca7e..bd2ba24 100755
--- a/scripts/build/chroot_packageslists
+++ b/scripts/build/chroot_packageslists
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
@@ -38,10 +38,10 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LH_PACKAGES_LISTS}" ] && [ "${LH_PACKAGES_LISTS}" != "none" ]
+if [ -n "${LB_PACKAGES_LISTS}" ] && [ "${LB_PACKAGES_LISTS}" != "none" ]
then
- for LIST in ${LH_PACKAGES_LISTS}
+ for LIST in ${LB_PACKAGES_LISTS}
do
# Generating package list
Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed
index 52822a9..22bfe7a 100755
--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'execute preseed in chroot')"
@@ -39,9 +39,9 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing preseeds
-for PRESEED in ${LH_PACKAGES_LISTS} ${LH_TASKS}
+for PRESEED in ${LB_PACKAGES_LISTS} ${LB_TASKS}
do
- if [ -f ${LH_BASE:-/usr/share/live/build}/preseed/"${PRESEED}" ]
+ if [ -f ${LB_BASE:-/usr/share/live/build}/preseed/"${PRESEED}" ]
then
# Check dependency
Check_package chroot/usr/bin/debconf-set-selections debconf
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
index c46c9e5..4af28ad 100755
--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /proc')"
@@ -43,13 +43,13 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Creating mountpoint
mkdir -p chroot/proc
# Mounting /proc
- ${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
+ ${LB_ROOT_COMMAND} mount proc-live -t proc chroot/proc
else
rm -rf chroot/proc
ln -s /proc chroot/
@@ -68,19 +68,19 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Workaround binfmt-support /proc locking
if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
then
- ${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
+ ${LB_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
fi
# Unmounting /proc
#fuser -km chroot/proc
if [ -e chroot/proc/version ]
then
- ${LH_ROOT_COMMAND} umount chroot/proc
+ ${LB_ROOT_COMMAND} umount chroot/proc
fi
else
rm -rf chroot/proc
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index 10c6385..d1c3766 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index 1fb263e..0f30d3b 100755
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /selinux')"
@@ -45,13 +45,13 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Create mountpoint
mkdir -p chroot/selinux
# Mounting /selinux
- ${LH_ROOT_COMMAND} mount selinuxfs-live -t selinuxfs chroot/selinux
+ ${LB_ROOT_COMMAND} mount selinuxfs-live -t selinuxfs chroot/selinux
else
rm -rf chroot/selinux
ln -s /selinux chroot/
@@ -71,13 +71,13 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Unmounting /selinux
#fuser -km chroot/selinux
if [ -e chroot/selinux/enforce ]
then
- ${LH_ROOT_COMMAND} umount chroot/selinux
+ ${LB_ROOT_COMMAND} umount chroot/selinux
fi
else
if [ -e chroot/selinux ]
diff --git a/scripts/build/chroot_sources b/scripts/build/chroot_sources
index 2747647..cddbd8e 100755
--- a/scripts/build/chroot_sources
+++ b/scripts/build/chroot_sources
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
@@ -27,7 +27,7 @@ Set_defaults
# Requiring stage file
Require_stagefile .stage/config .stage/bootstrap
-_LH_LOCAL_KEY_EMAIL="live-build-local-key at invalid"
+_LB_LOCAL_KEY_EMAIL="live-build-local-key at invalid"
case "${1}" in
install)
@@ -46,60 +46,60 @@ case "${1}" in
Restore_cache cache/packages_chroot
# Configure custom sources.list
- echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
- if [ "${LH_SECURITY}" = "true" ]
+ if [ "${LB_SECURITY}" = "true" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
*)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
esac
fi
- if [ "${LH_VOLATILE}" = "true" ]
+ if [ "${LB_VOLATILE}" = "true" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
- echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
@@ -125,11 +125,11 @@ case "${1}" in
fi
# Configure third-party repositories
- if [ -n "${LH_REPOSITORIES}" ]
+ if [ -n "${LB_REPOSITORIES}" ]
then
- for REPOSITORY in ${LH_REPOSITORIES}
+ for REPOSITORY in ${LB_REPOSITORIES}
do
- for PLACE in config/repositories "${LH_BASE}/repositories"
+ for PLACE in config/repositories "${LB_BASE}/repositories"
do
# Prefer repositories from the config tree
# over the global ones.
@@ -141,19 +141,19 @@ case "${1}" in
# Adding sources.list entries (chroot)
if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
then
- sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
- -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+ sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}.chroot" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
elif [ -e "${PLACE}/${REPOSITORY}" ]
then
- sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
- -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+ sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
fi
- if [ "${LH_APT_SECURE}" != false ]
+ if [ "${LB_APT_SECURE}" != false ]
then
# Adding archive signing keys (chroot)
if [ -e "${PLACE}/${REPOSITORY}.chroot.gpg" ]
@@ -180,9 +180,9 @@ case "${1}" in
fi
# Copy packages
- if Find_files config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb
+ if Find_files config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
then
- cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root/local-packages
+ cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
fi
if Find_files config/chroot_local-packages/*_all.deb
@@ -195,7 +195,7 @@ case "${1}" in
# If we bootstrapped a minimal chroot, we need
# to install apt-utils before we have have
# completed all the indices.
- case "${LH_PACKAGES_LISTS}" in
+ case "${LB_PACKAGES_LISTS}" in
stripped|minimal)
Chroot chroot "apt-get update"
;;
@@ -216,12 +216,12 @@ case "${1}" in
-o APT::FTPArchive::Release::Origin=chroot_local-packages \
release . > Release" | Chroot chroot sh
- if [ "${LH_APT_SECURE}" = "true" ]
+ if [ "${LB_APT_SECURE}" = "true" ]
then
- _LH_DOTGNUPG_EXISTED=0
+ _LB_DOTGNUPG_EXISTED=0
if [ -d chroot/root/.gnupg ]
then
- _LH_DOTGNUPG_EXISTED=1
+ _LB_DOTGNUPG_EXISTED=1
fi
# Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
@@ -243,21 +243,21 @@ case "${1}" in
Subkey-Type: ELG-E
Subkey-Length: 1024
Name-Real: live-build local packages key
- Name-Email: ${_LH_LOCAL_KEY_EMAIL}
+ Name-Email: ${_LB_LOCAL_KEY_EMAIL}
Expire-Date: 0
%secring /root/local-package-keyring.sec
%pubring /root/local-package-keyring.pub
- %commit" | Chroot chroot "gpg --batch --gen-key" || _LH_RET=${?}
+ %commit" | Chroot chroot "gpg --batch --gen-key" || _LB_RET=${?}
- case "${_LH_RET}" in
+ case "${_LB_RET}" in
""|2)
# Gnupg sometimes seems to return with a status of 2 when there was not
# enough entropy (and key creation blocks temporarily) even if the
# operation was ultimately successful.
;;
*)
- Echo_error "GPG exited with error status %s" "${_LH_RET}"
- exit ${_LH_RET}
+ Echo_error "GPG exited with error status %s" "${_LB_RET}"
+ exit ${_LB_RET}
;;
esac
@@ -273,7 +273,7 @@ case "${1}" in
# Import key
Chroot chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \
--keyring /root/local-package-keyring.pub --armor \
- --export ${_LH_LOCAL_KEY_EMAIL}" | Chroot chroot "apt-key add -"
+ --export ${_LB_LOCAL_KEY_EMAIL}" | Chroot chroot "apt-key add -"
# Remove temporary keyrings
rm chroot/root/local-package-keyring.pub
@@ -283,7 +283,7 @@ case "${1}" in
mv chroot/dev/random.orig chroot/dev/random
# Remove /root/.gnupg if we created it during the signing process
- if [ "${_LH_DOTGNUPG_EXISTED}" -eq 0 ]
+ if [ "${_LB_DOTGNUPG_EXISTED}" -eq 0 ]
then
rm -rf chroot/root/.gnupg
fi
@@ -300,7 +300,7 @@ case "${1}" in
fi
# Update indices from cache
- if [ "${LH_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ]
+ if [ "${LB_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ]
then
if Find_files cache/indices_bootstrap/secring.gpg*
then
@@ -337,7 +337,7 @@ case "${1}" in
cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
fi
- if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
+ if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
then
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
@@ -365,7 +365,7 @@ case "${1}" in
fi
# Installing aptitude
- if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
+ if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
then
Chroot chroot "apt-get ${APT_OPTIONS} update"
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
@@ -376,13 +376,13 @@ case "${1}" in
Apt dist-upgrade
# Installing keyring packages
- if [ -n "${LH_KEYRING_PACKAGES}" ]
+ if [ -n "${LB_KEYRING_PACKAGES}" ]
then
- Chroot chroot "apt-get --yes --force-yes install ${LH_KEYRING_PACKAGES}"
+ Chroot chroot "apt-get --yes --force-yes install ${LB_KEYRING_PACKAGES}"
Apt update
fi
- if [ "${LH_CACHE_INDICES}" = "true" ]
+ if [ "${LB_CACHE_INDICES}" = "true" ]
then
mkdir -p cache/indices_bootstrap
@@ -425,8 +425,8 @@ case "${1}" in
# Configure generic indices
# Don't do anything if it's not required
- if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \
- [ "${LH_MIRROR_CHROOT_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] && \
+ if [ "${LB_MIRROR_CHROOT}" = "${LB_MIRROR_BINARY}" ] && \
+ [ "${LB_MIRROR_CHROOT_SECURITY}" = "${LB_MIRROR_BINARY_SECURITY}" ] && \
[ ! -d chroot/root/local-packages ]
then
# Removing stage file
@@ -439,74 +439,74 @@ case "${1}" in
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
- echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
- if [ "${LH_SECURITY}" = "true" ]
+ if [ "${LB_SECURITY}" = "true" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
ubuntu)
- echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
*)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
esac
fi
- if [ "${LH_VOLATILE}" = "true" ]
+ if [ "${LB_VOLATILE}" = "true" ]
then
- case "${LH_MODE}" in
+ case "${LB_MODE}" in
debian|debian-release)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}/volatile ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
- echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
+ if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
fi
# Configure third-party repositories
- if [ -n "${LH_REPOSITORIES}" ]
+ if [ -n "${LB_REPOSITORIES}" ]
then
- for REPOSITORY in ${LH_REPOSITORIES}
+ for REPOSITORY in ${LB_REPOSITORIES}
do
# Removing sources.list entries (chroot)
rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
- for PLACE in config/repositories "${LH_BASE}/repositories"
+ for PLACE in config/repositories "${LB_BASE}/repositories"
do
# Prefer repositories from the config tree
# over the global ones.
@@ -518,19 +518,19 @@ case "${1}" in
# Adding sources.list entries (binary)
if [ -e "${PLACE}/${REPOSITORY}.binary" ]
then
- sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
- -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+ sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}.binary" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
elif [ -e "${PLACE}/${REPOSITORY}" ]
then
- sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
- -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+ sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
fi
- if [ "${LH_APT_SECURE}" != false ]
+ if [ "${LB_APT_SECURE}" != false ]
then
# Adding archive signing keys (binary)
if [ -e "${PLACE}/${REPOSITORY}.binary.gpg" ]
@@ -583,7 +583,7 @@ case "${1}" in
mkdir -p chroot/var/cache/apt/archives/partial
# Cleaning apt package lists
- if [ "${LH_BINARY_INDICES}" = "false" ]
+ if [ "${LB_BINARY_INDICES}" = "false" ]
then
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
@@ -594,9 +594,9 @@ case "${1}" in
rm -rf chroot/root/local-packages
# Remove local packages key if it exists
- if apt-key list | grep -q ${_LH_LOCAL_KEY_EMAIL}
+ if apt-key list | grep -q ${_LB_LOCAL_KEY_EMAIL}
then
- apt-key del ${_LH_LOCAL_KEY_EMAIL}
+ apt-key del ${_LB_LOCAL_KEY_EMAIL}
fi
# Removing stage file
diff --git a/scripts/build/chroot_symlinks b/scripts/build/chroot_symlinks
index 4bceaae..b9150bb 100755
--- a/scripts/build/chroot_symlinks
+++ b/scripts/build/chroot_symlinks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'convert symlinks')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SYMLINKS}" != "true" ]
+if [ "${LB_SYMLINKS}" != "true" ]
then
exit 0
fi
diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs
index 041bf97..09f2643 100755
--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /sys')"
@@ -43,13 +43,13 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Create mountpoint
mkdir -p chroot/sys
# Mounting /sys
- ${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
+ ${LB_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
else
rm -rf chroot/sys
ln -s /sys chroot/
@@ -68,13 +68,13 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
- if [ "${LH_USE_FAKEROOT}" != "true" ]
+ if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Unmounting /sys
#fuser -km chroot/sys
if [ -e chroot/sys/class ]
then
- ${LH_ROOT_COMMAND} umount chroot/sys
+ ${LB_ROOT_COMMAND} umount chroot/sys
fi
else
rm -rf chroot/sys
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
index a61ddc2..f19b8f7 100755
--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
diff --git a/scripts/build/chroot_sysvinit b/scripts/build/chroot_sysvinit
index 0909d2b..d4dc0a4 100755
--- a/scripts/build/chroot_sysvinit
+++ b/scripts/build/chroot_sysvinit
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'configure sysvinit')"
@@ -38,7 +38,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LH_SYSVINIT}" = "true" ]
+if [ "${LB_SYSVINIT}" = "true" ]
then
# Disable all
for FILE in chroot/etc/init.d/*
@@ -47,7 +47,7 @@ then
done
# Re-enable all required (taken from -f standard chroot)
- for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
+ for PACKAGE in ${LB_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
do
if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
then
diff --git a/scripts/build/chroot_tasks b/scripts/build/chroot_tasks
index 83abb1d..4a8081e 100755
--- a/scripts/build/chroot_tasks
+++ b/scripts/build/chroot_tasks
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install tasks into chroot')"
@@ -38,13 +38,13 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -n "${LH_TASKS}" ] && [ "${LH_TASKS}" != "none" ]
+if [ -n "${LB_TASKS}" ] && [ "${LB_TASKS}" != "none" ]
then
# Restoring cache
Restore_cache cache/packages_chroot
# Checking depends
- case "${LH_TASKSEL}" in
+ case "${LB_TASKSEL}" in
aptitude)
Check_package chroot/usr/bin/aptitude aptitude
;;
@@ -58,13 +58,13 @@ then
Install_package
# Installing tasks
- case "${LH_TASKSEL}" in
+ case "${LB_TASKSEL}" in
aptitude)
- Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${LH_TASKS}"
+ Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${LB_TASKS}"
;;
tasksel)
- for TASK in ${LH_TASKS}
+ for TASK in ${LB_TASKS}
do
case "${TASK}" in
gnome*)
diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart
index 802de5e..7a4b691 100755
--- a/scripts/build/chroot_upstart
+++ b/scripts/build/chroot_upstart
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'manage /usr/sbin/initctl')"
diff --git a/scripts/build/clean b/scripts/build/clean
index 280de86..f734a50 100755
--- a/scripts/build/clean
+++ b/scripts/build/clean
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Read meta config
if [ "${1}" != "noauto" ] && [ -x auto/clean ]
@@ -68,30 +68,30 @@ do
;;
--cache)
- ${LH_ROOT_COMMAND} rm -rf cache
+ ${LB_ROOT_COMMAND} rm -rf cache
;;
--chroot)
Echo_message "Cleaning chroot"
- ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/var/lib/dpkg > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/var/lib/dpkg > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/binary.tmp > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev.tmp/pts > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/binary.tmp > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev.tmp/pts > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
+ ${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp
rm -f .stage/chroot*
;;
--binary)
- ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
rm -rf binary.tmp binary.deb binary.udeb
rm -f binary*.iso
rm -f binary*.img
diff --git a/scripts/build/config b/scripts/build/config
index f4ffa6f..c4ce1e8 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Read meta config
if [ "${1}" != "noauto" ] && [ -x auto/config ]
@@ -26,7 +26,7 @@ then
fi
# Setting static variables
-SYSTEM_LH_CONFFILE="/etc/default/live-build"
+SYSTEM_LB_CONFFILE="/etc/default/live-build"
DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
@@ -231,22 +231,22 @@ Local_arguments ()
# config/common
--apt)
- LH_APT="${2}"
+ LB_APT="${2}"
shift 2
;;
--apt-ftp-proxy)
- LH_APT_FTP_PROXY="${2}"
+ LB_APT_FTP_PROXY="${2}"
shift 2
;;
--apt-http-proxy)
- LH_APT_HTTP_PROXY="${2}"
+ LB_APT_HTTP_PROXY="${2}"
shift 2
;;
--apt-pdiffs)
- LH_APT_PDIFFS="${2}"
+ LB_APT_PDIFFS="${2}"
shift 2
;;
--apt-options)
@@ -255,112 +255,112 @@ Local_arguments ()
;;
--aptitude-options)
- LH_APTITUDE_OPTIONS="${2}"
+ LB_APTITUDE_OPTIONS="${2}"
shift 2
;;
--apt-pipeline)
- LH_APT_PIPELINE="${2}"
+ LB_APT_PIPELINE="${2}"
shift 2
;;
--apt-recommends)
- LH_APT_RECOMMENDS="${2}"
+ LB_APT_RECOMMENDS="${2}"
shift 2
;;
--apt-secure)
- LH_APT_SECURE="${2}"
+ LB_APT_SECURE="${2}"
shift 2
;;
--bootstrap)
- LH_BOOTSTRAP="${2}"
+ LB_BOOTSTRAP="${2}"
shift 2
;;
--cache)
- LH_CACHE="${2}"
+ LB_CACHE="${2}"
shift 2
;;
--cache-indices)
- LH_CACHE_INDICES="${2}"
+ LB_CACHE_INDICES="${2}"
shift 2
;;
--cache-packages)
- LH_CACHE_PACKAGES="${2}"
+ LB_CACHE_PACKAGES="${2}"
shift 2
;;
--cache-stages)
- LH_CACHE_STAGES="${2}"
+ LB_CACHE_STAGES="${2}"
shift 2
;;
--debconf-frontend)
- LH_DEBCONF_FRONTEND="${2}"
+ LB_DEBCONF_FRONTEND="${2}"
shift 2
;;
--debconf-nowarnings)
- LH_DEBCONF_NOWARNINGS="${2}"
+ LB_DEBCONF_NOWARNINGS="${2}"
shift 2
;;
--debconf-priority)
- LH_DEBCONF_PRIORITY="${2}"
+ LB_DEBCONF_PRIORITY="${2}"
shift 2
;;
--initramfs)
- LH_INITRAMFS="${2}"
+ LB_INITRAMFS="${2}"
shift 2
;;
--fdisk)
- LH_FDISK="${2}"
+ LB_FDISK="${2}"
shift 2
;;
--losetup)
- LH_LOSETUP="${2}"
+ LB_LOSETUP="${2}"
shift 2
;;
--mode)
- LH_MODE="${2}"
+ LB_MODE="${2}"
shift 2
;;
-r|--repositories)
- LH_REPOSITORIES="${2}"
+ LB_REPOSITORIES="${2}"
shift 2
;;
--root-command)
- LH_ROOT_COMMAND="${2}"
+ LB_ROOT_COMMAND="${2}"
shift 2
;;
--use-fakeroot)
- LH_USE_FAKEROOT="${2}"
+ LB_USE_FAKEROOT="${2}"
shift 2
;;
--tasksel)
- LH_TASKSEL="${2}"
+ LB_TASKSEL="${2}"
shift 2
;;
--includes)
- LH_INCLUDES="${2}"
+ LB_INCLUDES="${2}"
shift 2
;;
--templates)
- LH_TEMPLATES="${2}"
+ LB_TEMPLATES="${2}"
shift 2
;;
@@ -371,96 +371,96 @@ Local_arguments ()
# config/bootstrap
-a|--architecture)
- LH_ARCHITECTURE="${2}"
+ LB_ARCHITECTURE="${2}"
shift 2
;;
--bootstrap-config)
- LH_BOOTSTRAP_CONFIG="${2}"
+ LB_BOOTSTRAP_CONFIG="${2}"
shift 2
;;
-f|--bootstrap-flavour)
- LH_BOOTSTRAP_FLAVOUR="${2}"
+ LB_BOOTSTRAP_FLAVOUR="${2}"
shift 2
;;
--bootstrap-keyring)
- LH_BOOTSTRAP_KEYRING="${2}"
+ LB_BOOTSTRAP_KEYRING="${2}"
shift 2
;;
-d|--distribution)
- LH_DISTRIBUTION="${2}"
+ LB_DISTRIBUTION="${2}"
BACKPORTS="false"
shift 2
- case "${LH_DISTRIBUTION}" in
+ case "${LB_DISTRIBUTION}" in
lenny-backports)
- LH_DISTRIBUTION="lenny"
+ LB_DISTRIBUTION="lenny"
BACKPORTS="true"
;;
esac
;;
-m|--mirror-bootstrap)
- LH_MIRROR_BOOTSTRAP="${2}"
+ LB_MIRROR_BOOTSTRAP="${2}"
shift 2
;;
--mirror-chroot)
- LH_MIRROR_CHROOT="${2}"
+ LB_MIRROR_CHROOT="${2}"
shift 2
;;
--mirror-chroot-security)
- LH_MIRROR_CHROOT_SECURITY="${2}"
+ LB_MIRROR_CHROOT_SECURITY="${2}"
shift 2
;;
--mirror-chroot-volatile)
- LH_MIRROR_CHROOT_VOLATILE="${2}"
+ LB_MIRROR_CHROOT_VOLATILE="${2}"
shift 2
;;
--mirror-binary)
- LH_MIRROR_BINARY="${2}"
+ LB_MIRROR_BINARY="${2}"
shift 2
;;
--mirror-binary-security)
- LH_MIRROR_BINARY_SECURITY="${2}"
+ LB_MIRROR_BINARY_SECURITY="${2}"
shift 2
;;
--mirror-binary-volatile)
- LH_MIRROR_BINARY_VOLATILE="${2}"
+ LB_MIRROR_BINARY_VOLATILE="${2}"
shift 2
;;
--mirror-debian-installer)
- LH_MIRROR_DEBIAN_INSTALLER="${2}"
+ LB_MIRROR_DEBIAN_INSTALLER="${2}"
shift 2
;;
--archive-areas)
- LH_ARCHIVE_AREAS="${2}"
+ LB_ARCHIVE_AREAS="${2}"
shift 2
;;
# config/chroot
--chroot-filesystem)
- LH_CHROOT_FILESYSTEM="${2}"
+ LB_CHROOT_FILESYSTEM="${2}"
shift 2
;;
--virtual-root-size)
- LH_VIRTUAL_ROOT_SIZE="${2}"
+ LB_VIRTUAL_ROOT_SIZE="${2}"
shift 2
;;
--exposed-root)
- LH_EXPOSED_ROOT="${2}"
+ LB_EXPOSED_ROOT="${2}"
shift 2
;;
@@ -470,259 +470,259 @@ Local_arguments ()
;;
--hooks)
- LH_HOOKS="${2}"
+ LB_HOOKS="${2}"
shift 2
;;
--interactive)
- LH_INTERACTIVE="${2}"
+ LB_INTERACTIVE="${2}"
shift 2
;;
--keyring-packages)
- LH_KEYRING_PACKAGES="${2}"
+ LB_KEYRING_PACKAGES="${2}"
shift 2
;;
-l|--language)
- LH_LANGUAGE="${2}"
+ LB_LANGUAGE="${2}"
shift 2
;;
-k|--linux-flavours)
- LH_LINUX_FLAVOURS="${2}"
+ LB_LINUX_FLAVOURS="${2}"
shift 2
;;
--linux-packages)
- LH_LINUX_PACKAGES="${2}"
+ LB_LINUX_PACKAGES="${2}"
shift 2
;;
--packages)
- LH_PACKAGES="${2}"
+ LB_PACKAGES="${2}"
shift 2
;;
-p|--packages-lists)
- LH_PACKAGES_LISTS="${2}"
+ LB_PACKAGES_LISTS="${2}"
shift 2
;;
--tasks)
- LH_TASKS="${2}"
+ LB_TASKS="${2}"
shift 2
;;
--security)
- LH_SECURITY="${2}"
+ LB_SECURITY="${2}"
shift 2
;;
--volatile)
- LH_VOLATILE="${2}"
+ LB_VOLATILE="${2}"
shift 2
;;
--symlinks)
- LH_SYMLINKS="${2}"
+ LB_SYMLINKS="${2}"
shift 2
;;
--sysvinit)
- LH_SYSVINIT="${2}"
+ LB_SYSVINIT="${2}"
shift 2
;;
# config/binary
--binary-filesystem)
- LH_BINARY_FILESYSTEM="${2}"
+ LB_BINARY_FILESYSTEM="${2}"
shift 2
;;
-b|--binary-images)
- LH_BINARY_IMAGES="${2}"
+ LB_BINARY_IMAGES="${2}"
shift 2
;;
--binary-indices)
- LH_BINARY_INDICES="${2}"
+ LB_BINARY_INDICES="${2}"
shift 2
;;
--bootappend-live)
- LH_BOOTAPPEND_LIVE="${2}"
+ LB_BOOTAPPEND_LIVE="${2}"
shift 2
;;
--bootappend-install)
- LH_BOOTAPPEND_INSTALL="${2}"
+ LB_BOOTAPPEND_INSTALL="${2}"
shift 2
;;
--bootloader)
- LH_BOOTLOADER="${2}"
+ LB_BOOTLOADER="${2}"
shift 2
;;
--checksums)
- LH_CHECKSUMS="${2}"
+ LB_CHECKSUMS="${2}"
shift 2
;;
--build-with-chroot)
- LH_BUILD_WITH_CHROOT="${2}"
+ LB_BUILD_WITH_CHROOT="${2}"
shift 2
;;
--debian-installer)
- LH_DEBIAN_INSTALLER="${2}"
+ LB_DEBIAN_INSTALLER="${2}"
shift 2
;;
--debian-installer-distribution)
- LH_DEBIAN_INSTALLER_DISTRIBUTION="${2}"
+ LB_DEBIAN_INSTALLER_DISTRIBUTION="${2}"
shift 2
;;
--debian-installer-preseedfile)
- LH_DEBIAN_INSTALLER_PRESEEDFILE="${2}"
+ LB_DEBIAN_INSTALLER_PRESEEDFILE="${2}"
shift 2
;;
--debian-installer-gui)
- LH_DEBIAN_INSTALLER_GUI="${2}"
+ LB_DEBIAN_INSTALLER_GUI="${2}"
shift 2
;;
-e|--encryption)
- LH_ENCRYPTION="${2}"
+ LB_ENCRYPTION="${2}"
shift 2
;;
--grub-splash)
- LH_GRUB_SPLASH="${2}"
+ LB_GRUB_SPLASH="${2}"
shift 2
;;
--hostname)
- LH_HOSTNAME="${2}"
+ LB_HOSTNAME="${2}"
shift 2
;;
--isohybrid-options)
- LH_ISOHYBRID_OPTIONS="${2}"
+ LB_ISOHYBRID_OPTIONS="${2}"
shift 2
;;
--iso-application)
- LH_ISO_APPLICATION="${2}"
+ LB_ISO_APPLICATION="${2}"
shift 2
;;
--iso-preparer)
- LH_ISO_PREPARER="${2}"
+ LB_ISO_PREPARER="${2}"
shift 2
;;
--iso-publisher)
- LH_ISO_PUBLISHER="${2}"
+ LB_ISO_PUBLISHER="${2}"
shift 2
;;
--iso-volume)
- LH_ISO_VOLUME="${2}"
+ LB_ISO_VOLUME="${2}"
shift 2
;;
--jffs2-eraseblock)
- LH_JFFS2_ERASEBLOCK="${2}"
+ LB_JFFS2_ERASEBLOCK="${2}"
shift 2
;;
--memtest)
- LH_MEMTEST="${2}"
+ LB_MEMTEST="${2}"
shift 2
;;
--net-root-filesystem)
- LH_NET_ROOT_FILESYSTEM="${2}"
+ LB_NET_ROOT_FILESYSTEM="${2}"
shift 2
;;
--net-root-mountoptions)
- LH_NET_ROOT_MOUNTOPTIONS="${2}"
+ LB_NET_ROOT_MOUNTOPTIONS="${2}"
shift 2
;;
--net-root-path)
- LH_NET_ROOT_PATH="${2}"
+ LB_NET_ROOT_PATH="${2}"
shift 2
;;
--net-root-server)
- LH_NET_ROOT_SERVER="${2}"
+ LB_NET_ROOT_SERVER="${2}"
shift 2
;;
--net-cow-filesystem)
- LH_NET_COW_FILESYSTEM="${2}"
+ LB_NET_COW_FILESYSTEM="${2}"
shift 2
;;
--net-cow-mountoptions)
- LH_NET_COW_MOUNTOPTIONS="${2}"
+ LB_NET_COW_MOUNTOPTIONS="${2}"
shift 2
;;
--net-cow-path)
- LH_NET_COW_PATH="${2}"
+ LB_NET_COW_PATH="${2}"
shift 2
;;
--net-cow-server)
- LH_NET_COW_SERVER="${2}"
+ LB_NET_COW_SERVER="${2}"
shift 2
;;
--net-tarball)
- LH_NET_TARBALL="${2}"
+ LB_NET_TARBALL="${2}"
shift 2
;;
--syslinux-splash)
- LH_SYSLINUX_SPLASH="${2}"
+ LB_SYSLINUX_SPLASH="${2}"
shift 2
;;
--syslinux-timeout)
- LH_SYSLINUX_TIMEOUT="${2}"
+ LB_SYSLINUX_TIMEOUT="${2}"
shift 2
;;
--syslinux-menu)
- LH_SYSLINUX_MENU="${2}"
+ LB_SYSLINUX_MENU="${2}"
shift 2
;;
--username)
- LH_USERNAME="${2}"
+ LB_USERNAME="${2}"
shift 2
;;
--win32-loader)
- LH_WIN32_LOADER="${2}"
+ LB_WIN32_LOADER="${2}"
shift 2
;;
# config/source
--source)
- LH_SOURCE="${2}"
+ LB_SOURCE="${2}"
shift 2
;;
-s|--source-images)
- LH_SOURCE_IMAGES="${2}"
+ LB_SOURCE_IMAGES="${2}"
shift 2
;;
@@ -795,10 +795,10 @@ Local_arguments ()
}
# Reading system configuration
-if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
+if [ -f "${SYSTEM_LB_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
then
- Echo_message "Considering defaults defined in %s" "${SYSTEM_LH_CONFFILE}"
- Read_conffiles "${SYSTEM_LH_CONFFILE}"
+ Echo_message "Considering defaults defined in %s" "${SYSTEM_LB_CONFFILE}"
+ Read_conffiles "${SYSTEM_LB_CONFFILE}"
fi
# Reading existing configuration
@@ -833,104 +833,104 @@ mkdir -p config/templates
cat > config/common << EOF
# config/common - common options for live-build(7)
-# LH_CONFIG_VERSION: internal version of the configuration file format
-LH_CONFIG_VERSION="${CONFIG_VERSION}"
+# LB_CONFIG_VERSION: internal version of the configuration file format
+LB_CONFIG_VERSION="${CONFIG_VERSION}"
-# \$LH_APT: set package manager
-# (Default: ${LH_APT})
-LH_APT="${LH_APT}"
+# \$LB_APT: set package manager
+# (Default: ${LB_APT})
+LB_APT="${LB_APT}"
-# \$LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
+# \$LB_APT_FTP_PROXY: set apt/aptitude ftp proxy
# (Default: autodetected or empty)
-LH_APT_FTP_PROXY="${LH_APT_FTP_PROXY}"
+LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}"
-# \$LH_APT_HTTP_PROXY: set apt/aptitude http proxy
+# \$LB_APT_HTTP_PROXY: set apt/aptitude http proxy
# (Default: autodetected or empty)
-LH_APT_HTTP_PROXY="${LH_APT_HTTP_PROXY}"
+LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}"
-# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: ${LH_APT_PDIFFS})
-LH_APT_PDIFFS="${LH_APT_PDIFFS}"
+# \$LB_APT_PDIFFS: set apt/aptitude pdiff indices
+# (Default: ${LB_APT_PDIFFS})
+LB_APT_PDIFFS="${LB_APT_PDIFFS}"
-# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: ${LH_APT_PIPELINE})
-LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+# \$LB_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LB_APT_PIPELINE})
+LB_APT_PIPELINE="${LB_APT_PIPELINE}"
-# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: ${LH_APT_RECOMMENDS})
-LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
+# \$LB_APT_RECOMMENDS: set apt/aptitude recommends
+# (Default: ${LB_APT_RECOMMENDS})
+LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS}"
-# \$LH_APT_SECURE: set apt/aptitude security
-# (Default: ${LH_APT_SECURE})
-LH_APT_SECURE="${LH_APT_SECURE}"
+# \$LB_APT_SECURE: set apt/aptitude security
+# (Default: ${LB_APT_SECURE})
+LB_APT_SECURE="${LB_APT_SECURE}"
-# \$LH_BOOTSTRAP: set bootstrap program
-# (Default: ${LH_BOOTSTRAP})
-LH_BOOTSTRAP="${LH_BOOTSTRAP}"
+# \$LB_BOOTSTRAP: set bootstrap program
+# (Default: ${LB_BOOTSTRAP})
+LB_BOOTSTRAP="${LB_BOOTSTRAP}"
-# \$LH_CACHE: control cache
-# (Default: ${LH_CACHE})
-LH_CACHE="${LH_CACHE}"
+# \$LB_CACHE: control cache
+# (Default: ${LB_CACHE})
+LB_CACHE="${LB_CACHE}"
-# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: ${LH_CACHE_INDICES})
-LH_CACHE_INDICES="${LH_CACHE_INDICES}"
+# \$LB_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: ${LB_CACHE_INDICES})
+LB_CACHE_INDICES="${LB_CACHE_INDICES}"
-# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: ${LH_CACHE_PACKAGES})
-LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
+# \$LB_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: ${LB_CACHE_PACKAGES})
+LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES}"
-# \$LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: ${LH_CACHE_STAGES})
-LH_CACHE_STAGES="${LH_CACHE_STAGES}"
+# \$LB_CACHE_STAGES: control if completed stages should be cached
+# (Default: ${LB_CACHE_STAGES})
+LB_CACHE_STAGES="${LB_CACHE_STAGES}"
-# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: ${LH_DEBCONF_FRONTEND})
-LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
+# \$LB_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# (Default: ${LB_DEBCONF_FRONTEND})
+LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND}"
-# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: ${LH_DEBCONF_NOWARNINGS})
-LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
+# \$LB_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: ${LB_DEBCONF_NOWARNINGS})
+LB_DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}"
-# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+# \$LB_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LB_DEBCONF_PRIORITY})
+LB_DEBCONF_PRIORITY="${LB_DEBCONF_PRIORITY}"
-# \$LH_INITRAMFS: set initramfs hook
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
+# \$LB_INITRAMFS: set initramfs hook
+# (Default: ${LB_INITRAMFS})
+LB_INITRAMFS="${LB_INITRAMFS}"
-# \$LH_FDISK: set fdisk program
+# \$LB_FDISK: set fdisk program
# (Default: autodetected)
-LH_FDISK="${LH_FDISK}"
+LB_FDISK="${LB_FDISK}"
-# \$LH_LOSETUP: set losetup program
+# \$LB_LOSETUP: set losetup program
# (Default: autodetected)
-LH_LOSETUP="${LH_LOSETUP}"
+LB_LOSETUP="${LB_LOSETUP}"
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
+# \$LB_MODE: set distribution mode
+# (Default: ${LB_MODE})
+LB_MODE="${LB_MODE}"
-# \$LH_ROOT_COMMAND: use sudo or equivalent
+# \$LB_ROOT_COMMAND: use sudo or equivalent
# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
+#LB_ROOT_COMMAND="sudo"
-# \$LH_USE_FAKEROOT: use fakeroot/fakechroot
-# (Default: ${LH_USE_FAKEROOT})
-LH_USE_FAKEROOT="${LH_USE_FAKEROOT}"
+# \$LB_USE_FAKEROOT: use fakeroot/fakechroot
+# (Default: ${LB_USE_FAKEROOT})
+LB_USE_FAKEROOT="${LB_USE_FAKEROOT}"
-# \$LH_TASKSEL: set tasksel program
-# (Default: ${LH_TASKSEL})
-LH_TASKSEL="${LH_TASKSEL}"
+# \$LB_TASKSEL: set tasksel program
+# (Default: ${LB_TASKSEL})
+LB_TASKSEL="${LB_TASKSEL}"
-# \$LH_INCLUDES: set includes
-# (Default: ${LH_INCLUDES})
-LH_INCLUDES="${LH_INCLUDES}"
+# \$LB_INCLUDES: set includes
+# (Default: ${LB_INCLUDES})
+LB_INCLUDES="${LB_INCLUDES}"
-# \$LH_TEMPLATES: set templates
-# (Default: ${LH_TEMPLATES})
-LH_TEMPLATES="${LH_TEMPLATES}"
+# \$LB_TEMPLATES: set templates
+# (Default: ${LB_TEMPLATES})
+LB_TEMPLATES="${LB_TEMPLATES}"
# live-build options
@@ -969,69 +969,69 @@ EOF
cat > config/bootstrap << EOF
# config/bootstrap - options for live-build(7), bootstrap stage
-# \$LH_ARCHITECTURE: select chroot architecture
+# \$LB_ARCHITECTURE: select chroot architecture
# (Default: autodetected)
-LH_ARCHITECTURE="${LH_ARCHITECTURE}"
+LB_ARCHITECTURE="${LB_ARCHITECTURE}"
-# \$LH_BOOTSTRAP_CONFIG: set distribution config directory
+# \$LB_BOOTSTRAP_CONFIG: set distribution config directory
# (Default: empty)
-LH_BOOTSTRAP_CONFIG="${LH_BOOTSTRAP_CONFIG}"
+LB_BOOTSTRAP_CONFIG="${LB_BOOTSTRAP_CONFIG}"
-# \$LH_BOOTSTRAP_INCLUDE: include packages on base
+# \$LB_BOOTSTRAP_INCLUDE: include packages on base
# (Default: empty)
-LH_BOOTSTRAP_INCLUDE="${LH_BOOTSTRAP_INCLUDE}"
+LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE}"
-# \$LH_BOOTSTRAP_EXCLUDE: exclude packages on base
+# \$LB_BOOTSTRAP_EXCLUDE: exclude packages on base
# (Default: empty)
-LH_BOOTSTRAP_EXCLUDE="${LH_BOOTSTRAP_EXCLUDE}"
+LB_BOOTSTRAP_EXCLUDE="${LB_BOOTSTRAP_EXCLUDE}"
-# \$LH_BOOTSTRAP_FLAVOUR: select flavour to use
+# \$LB_BOOTSTRAP_FLAVOUR: select flavour to use
# (Default: empty)
-LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR}"
+LB_BOOTSTRAP_FLAVOUR="${LB_BOOTSTRAP_FLAVOUR}"
-# \$LH_BOOTSTRAP_KEYRING: set distribution keyring
+# \$LB_BOOTSTRAP_KEYRING: set distribution keyring
# (Default: empty)
-LH_BOOTSTRAP_KEYRING="${LH_BOOTSTRAP_KEYRING}"
+LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}"
-# \$LH_DISTRIBUTION: select distribution to use
-# (Default: ${LH_DISTRIBUTION})
-LH_DISTRIBUTION="${LH_DISTRIBUTION}"
+# \$LB_DISTRIBUTION: select distribution to use
+# (Default: ${LB_DISTRIBUTION})
+LB_DISTRIBUTION="${LB_DISTRIBUTION}"
-# \$LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: ${LH_MIRROR_BOOTSTRAP})
-LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
+# \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
+# (Default: ${LB_MIRROR_BOOTSTRAP})
+LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"
-# \$LH_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: ${LH_MIRROR_CHROOT})
-LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT}"
+# \$LB_MIRROR_CHROOT: set mirror to fetch packages from
+# (Default: ${LB_MIRROR_CHROOT})
+LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT}"
-# \$LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
-# (Default: ${LH_MIRROR_CHROOT_SECURITY})
-LH_MIRROR_CHROOT_SECURITY="${LH_MIRROR_CHROOT_SECURITY}"
+# \$LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
+# (Default: ${LB_MIRROR_CHROOT_SECURITY})
+LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}"
-# \$LH_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
-# (Default: ${LH_MIRROR_CHROOT_VOLATILE})
-LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE}"
+# \$LB_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
+# (Default: ${LB_MIRROR_CHROOT_VOLATILE})
+LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE}"
-# \$LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LH_MIRROR_BINARY})
-LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
+# \$LB_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LB_MIRROR_BINARY})
+LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
-# \$LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LH_MIRROR_BINARY_SECURITY})
-LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
+# \$LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LB_MIRROR_BINARY_SECURITY})
+LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
-# \$LH_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
-# (Default: ${LH_MIRROR_BINARY_VOLATILE})
-LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE}"
+# \$LB_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
+# (Default: ${LB_MIRROR_BINARY_VOLATILE})
+LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE}"
-# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: ${LH_MIRROR_BOOTSTRAP})
-LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
+# \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
+# (Default: ${LB_MIRROR_BOOTSTRAP})
+LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
-# \$LH_ARCHIVE_AREAS: select archive areas to use
-# (Default: ${LH_ARCHIVE_AREAS})
-LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
+# \$LB_ARCHIVE_AREAS: select archive areas to use
+# (Default: ${LB_ARCHIVE_AREAS})
+LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
EOF
# Creating lh_chroot_* configuration
@@ -1047,77 +1047,77 @@ mkdir -p config/chroot_sources
cat > config/chroot << EOF
# config/chroot - options for live-build(7), chroot stage
-# \$LH_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: ${LH_CHROOT_FILESYSTEM})
-LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
+# \$LB_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LB_CHROOT_FILESYSTEM})
+LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
-# \$LH_UNION_FILESYSTEM: set union filesystem
-# (Default: ${LH_UNION_FILESYSTEM})
-LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM}"
+# \$LB_UNION_FILESYSTEM: set union filesystem
+# (Default: ${LB_UNION_FILESYSTEM})
+LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM}"
-# \$LH_VIRTUAL_ROOT_SIZE: set virtual-hdd filesystem size
-# (Default: ${LH_VIRTUAL_ROOT_SIZE})
-LH_VIRTUAL_ROOT_SIZE="${LH_VIRTUAL_ROOT_SIZE}"
+# \$LB_VIRTUAL_ROOT_SIZE: set virtual-hdd filesystem size
+# (Default: ${LB_VIRTUAL_ROOT_SIZE})
+LB_VIRTUAL_ROOT_SIZE="${LB_VIRTUAL_ROOT_SIZE}"
-# \$LH_EXPOSED_ROOT: expose root as read only
-# (Default: ${LH_EXPOSED_ROOT})
-LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT}"
+# \$LB_EXPOSED_ROOT: expose root as read only
+# (Default: ${LB_EXPOSED_ROOT})
+LB_EXPOSED_ROOT="${LB_EXPOSED_ROOT}"
-# \$LH_HOOKS: set hook commands
+# \$LB_HOOKS: set hook commands
# (Default: empty)
-LH_HOOKS="${LH_HOOKS}"
+LB_HOOKS="${LB_HOOKS}"
-# \$LH_INTERACTIVE: set interactive build
-# (Default: ${LH_INTERACTIVE})
-LH_INTERACTIVE="${LH_INTERACTIVE}"
+# \$LB_INTERACTIVE: set interactive build
+# (Default: ${LB_INTERACTIVE})
+LB_INTERACTIVE="${LB_INTERACTIVE}"
-# \$LH_KEYRING_PACKAGES: set keyring packages
+# \$LB_KEYRING_PACKAGES: set keyring packages
# (Default: empty)
-LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES}"
+LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES}"
-# \$LH_LANGUAGE: set language to use
+# \$LB_LANGUAGE: set language to use
# (Default: empty)
-LH_LANGUAGE="${LH_LANGUAGE}"
+LB_LANGUAGE="${LB_LANGUAGE}"
-# \$LH_LINUX_FLAVOURS: set kernel flavour to use
+# \$LB_LINUX_FLAVOURS: set kernel flavour to use
# (Default: autodetected)
-LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
+LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}"
-# \$LH_LINUX_PACKAGES: set kernel packages to use
+# \$LB_LINUX_PACKAGES: set kernel packages to use
# (Default: autodetected)
-LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES}"
+LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES}"
-# \$LH_REPOSITORIES: enable available third-party repositories
+# \$LB_REPOSITORIES: enable available third-party repositories
# (Default: empty)
-LH_REPOSITORIES="${LH_REPOSITORIES}"
+LB_REPOSITORIES="${LB_REPOSITORIES}"
-# \$LH_PACKAGES: set packages to install
+# \$LB_PACKAGES: set packages to install
# (Default: empty)
-LH_PACKAGES="${LH_PACKAGES}"
+LB_PACKAGES="${LB_PACKAGES}"
-# \$LH_PACKAGES_LISTS: set package list to install
-# (Default: ${LH_PACKAGES_LISTS})
-LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
+# \$LB_PACKAGES_LISTS: set package list to install
+# (Default: ${LB_PACKAGES_LISTS})
+LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS}"
-# \$LH_TASKS: set tasks to install
+# \$LB_TASKS: set tasks to install
# (Default: empty)
-LH_TASKS="${LH_TASKS}"
+LB_TASKS="${LB_TASKS}"
-# \$LH_SECURITY: enable security updates
-# (Default: ${LH_SECURITY})
-LH_SECURITY="${LH_SECURITY}"
+# \$LB_SECURITY: enable security updates
+# (Default: ${LB_SECURITY})
+LB_SECURITY="${LB_SECURITY}"
-# \$LH_VOLATILE: enable volatile updates
-# (Default: ${LH_VOLATILE})
-LH_VOLATILE="${LH_VOLATILE}"
+# \$LB_VOLATILE: enable volatile updates
+# (Default: ${LB_VOLATILE})
+LB_VOLATILE="${LB_VOLATILE}"
-# \$LH_SYMLINKS: enable symlink convertion
-# (Default: ${LH_SYMLINKS})
-LH_SYMLINKS="${LH_SYMLINKS}"
+# \$LB_SYMLINKS: enable symlink convertion
+# (Default: ${LB_SYMLINKS})
+LB_SYMLINKS="${LB_SYMLINKS}"
-# \$LH_SYSVINIT: enable sysvinit
-# (Default: ${LH_SYSVINIT})
-LH_SYSVINIT="${LH_SYSVINIT}"
+# \$LB_SYSVINIT: enable sysvinit
+# (Default: ${LB_SYSVINIT})
+LB_SYSVINIT="${LB_SYSVINIT}"
EOF
# Creating lh_binary_* configuration
@@ -1135,175 +1135,175 @@ mkdir -p config/binary_syslinux
cat > config/binary << EOF
# config/binary - options for live-build(7), binary stage
-# \$LH_BINARY_FILESYSTEM: set image filesystem
-# (Default: ${LH_BINARY_FILESYSTEM})
-LH_BINARY_FILESYSTEM="${LH_BINARY_FILESYSTEM}"
+# \$LB_BINARY_FILESYSTEM: set image filesystem
+# (Default: ${LB_BINARY_FILESYSTEM})
+LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM}"
-# \$LH_BINARY_IMAGES: set image type
-# (Default: ${LH_BINARY_IMAGES})
-LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
+# \$LB_BINARY_IMAGES: set image type
+# (Default: ${LB_BINARY_IMAGES})
+LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
-# \$LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LH_BINARY_INDICES})
-LH_BINARY_INDICES="${LH_BINARY_INDICES}"
+# \$LB_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LB_BINARY_INDICES})
+LB_BINARY_INDICES="${LB_BINARY_INDICES}"
-# \$LH_BOOTAPPEND_LIVE: set boot parameters
+# \$LB_BOOTAPPEND_LIVE: set boot parameters
# (Default: empty)
-LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
+LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"
-# \$LH_BOOTAPPEND_INSTALL: set boot parameters
+# \$LB_BOOTAPPEND_INSTALL: set boot parameters
# (Default: empty)
-LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
+LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}"
-# \$LH_BOOTLOADER: set bootloader
-# (Default: ${LH_BOOTLOADER})
-LH_BOOTLOADER="${LH_BOOTLOADER}"
+# \$LB_BOOTLOADER: set bootloader
+# (Default: ${LB_BOOTLOADER})
+LB_BOOTLOADER="${LB_BOOTLOADER}"
-# \$LH_CHECKSUMS: set checksums
-# (Default: ${LH_CHECKSUMS})
-LH_CHECKSUMS="${LH_CHECKSUMS}"
+# \$LB_CHECKSUMS: set checksums
+# (Default: ${LB_CHECKSUMS})
+LB_CHECKSUMS="${LB_CHECKSUMS}"
-# \${LH_BUILD_WITH_CHROOT: control if we build binary images chrooted
-# (Default: ${LH_BUILD_WITH_CHROOT})
+# \${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
+# (Default: ${LB_BUILD_WITH_CHROOT})
# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
-LH_BUILD_WITH_CHROOT="${LH_BUILD_WITH_CHROOT}"
+LB_BUILD_WITH_CHROOT="${LB_BUILD_WITH_CHROOT}"
-# \$LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LH_DEBIAN_INSTALLER})
-LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
+# \$LB_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LB_DEBIAN_INSTALLER})
+LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER}"
-# \$LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
+# \$LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
# (Default: empty)
-LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}"
+LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION}"
-# \$LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
-# (Default: ${LH_DEBIAN_INSTALLER_PRESEEDFILE})
-LH_DEBIAN_INSTALLER_PRESEEDFILE="${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+# \$LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
+# (Default: ${LB_DEBIAN_INSTALLER_PRESEEDFILE})
+LB_DEBIAN_INSTALLER_PRESEEDFILE="${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
-# \$LH_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
-# (Default: ${LH_DEBIAN_INSTALLER_GUI})
-LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI}"
+# \$LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
+# (Default: ${LB_DEBIAN_INSTALLER_GUI})
+LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI}"
-# \$LH_ENCRYPTION: set encryption
-# (Default: ${LH_ENCRYPTION})
-LH_ENCRYPTION="${LH_ENCRYPTION}"
+# \$LB_ENCRYPTION: set encryption
+# (Default: ${LB_ENCRYPTION})
+LB_ENCRYPTION="${LB_ENCRYPTION}"
-# \$LH_GRUB_SPLASH: set custom grub splash
+# \$LB_GRUB_SPLASH: set custom grub splash
# (Default: empty)
-LH_GRUB_SPLASH="${LH_GRUB_SPLASH}"
+LB_GRUB_SPLASH="${LB_GRUB_SPLASH}"
-# \$LH_HOSTNAME: set hostname
-# (Default: ${LH_HOSTNAME})
-LH_HOSTNAME="${LH_HOSTNAME}"
+# \$LB_HOSTNAME: set hostname
+# (Default: ${LB_HOSTNAME})
+LB_HOSTNAME="${LB_HOSTNAME}"
-# \$LH_ISO_APPLICATION: set iso author
-# (Default: ${LH_ISO_APPLICATION})
-LH_ISO_APPLICATION="${LH_ISO_APPLICATION}"
+# \$LB_ISO_APPLICATION: set iso author
+# (Default: ${LB_ISO_APPLICATION})
+LB_ISO_APPLICATION="${LB_ISO_APPLICATION}"
-# \$LH_ISO_PREPARER: set iso preparer
-# (Default: ${LH_ISO_PREPARER})
-LH_ISO_PREPARER="${LH_ISO_PREPARER}"
+# \$LB_ISO_PREPARER: set iso preparer
+# (Default: ${LB_ISO_PREPARER})
+LB_ISO_PREPARER="${LB_ISO_PREPARER}"
-# \$LH_ISO_PUBLISHER: set iso publisher
-# (Default: ${LH_ISO_PUBLISHER})
-LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
+# \$LB_ISO_PUBLISHER: set iso publisher
+# (Default: ${LB_ISO_PUBLISHER})
+LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}"
-# \$LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: ${LH_ISO_VOLUME})
-LH_ISO_VOLUME="${LH_ISO_VOLUME}"
+# \$LB_ISO_VOLUME: set iso volume (max 32 chars)
+# (Default: ${LB_ISO_VOLUME})
+LB_ISO_VOLUME="${LB_ISO_VOLUME}"
-# \$LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
+# \$LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
# (Default: unset)
-LH_JFFS2_ERASEBLOCK=""
+LB_JFFS2_ERASEBLOCK=""
-# \$LH_MEMTEST: set memtest
-# (Default: ${LH_MEMTEST})
-LH_MEMTEST="${LH_MEMTEST}"
+# \$LB_MEMTEST: set memtest
+# (Default: ${LB_MEMTEST})
+LB_MEMTEST="${LB_MEMTEST}"
-# \$LH_WIN32_LOADER: set win32-loader
-# (Default: ${LH_WIN32_LOADER})
-LH_WIN32_LOADER="${LH_WIN32_LOADER}"
+# \$LB_WIN32_LOADER: set win32-loader
+# (Default: ${LB_WIN32_LOADER})
+LB_WIN32_LOADER="${LB_WIN32_LOADER}"
-# \$LH_NET_ROOT_FILESYSTEM: set netboot filesystem
-# (Default: ${LH_NET_ROOT_FILESYSTEM})
-LH_NET_ROOT_FILESYSTEM="${LH_NET_ROOT_FILESYSTEM}"
+# \$LB_NET_ROOT_FILESYSTEM: set netboot filesystem
+# (Default: ${LB_NET_ROOT_FILESYSTEM})
+LB_NET_ROOT_FILESYSTEM="${LB_NET_ROOT_FILESYSTEM}"
-# \$LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
+# \$LB_NET_ROOT_MOUNTOPTIONS: set nfsopts
# (Default: empty)
-LH_NET_ROOT_MOUNTOPTIONS="${LH_NET_ROOT_MOUNTOPTIONS}"
+LB_NET_ROOT_MOUNTOPTIONS="${LB_NET_ROOT_MOUNTOPTIONS}"
-# \$LH_NET_ROOT_PATH: set netboot server directory
-# (Default: ${LH_NET_ROOT_PATH})
-LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
+# \$LB_NET_ROOT_PATH: set netboot server directory
+# (Default: ${LB_NET_ROOT_PATH})
+LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}"
-# \$LH_NET_ROOT_SERVER: set netboot server address
-# (Default: ${LH_NET_ROOT_SERVER})
-LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
+# \$LB_NET_ROOT_SERVER: set netboot server address
+# (Default: ${LB_NET_ROOT_SERVER})
+LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}"
-# \$LH_NET_COW_FILESYSTEM: set net client cow filesystem
-# (Default: ${LH_NET_COW_FILESYSTEM})
-LH_NET_COW_FILESYSTEM="${LH_NET_COW_FILESYSTEM}"
+# \$LB_NET_COW_FILESYSTEM: set net client cow filesystem
+# (Default: ${LB_NET_COW_FILESYSTEM})
+LB_NET_COW_FILESYSTEM="${LB_NET_COW_FILESYSTEM}"
-# \$LH_NET_COW_MOUNTOPTIONS: set cow mount options
+# \$LB_NET_COW_MOUNTOPTIONS: set cow mount options
# (Default: empty)
-LH_NET_COW_MOUNTOPTIONS="${LH_NET_COW_MOUNTOPTIONS}"
+LB_NET_COW_MOUNTOPTIONS="${LB_NET_COW_MOUNTOPTIONS}"
-# \$LH_NET_COW_PATH: set cow directory
-# (Default: ${LH_NET_COW_PATH})
-LH_NET_COW_PATH="${LH_NET_COW_PATH}"
+# \$LB_NET_COW_PATH: set cow directory
+# (Default: ${LB_NET_COW_PATH})
+LB_NET_COW_PATH="${LB_NET_COW_PATH}"
-# \$LH_NET_COW_SERVER: set cow server
-# (Default: ${LH_NET_COW_SERVER})
-LH_NET_COW_SERVER="${LH_NET_COW_SERVER}"
+# \$LB_NET_COW_SERVER: set cow server
+# (Default: ${LB_NET_COW_SERVER})
+LB_NET_COW_SERVER="${LB_NET_COW_SERVER}"
-# \$LH_NET_TARBALL: set net tarball
-# (Default: ${LH_NET_TARBALL})
-LH_NET_TARBALL="${LH_NET_TARBALL}"
+# \$LB_NET_TARBALL: set net tarball
+# (Default: ${LB_NET_TARBALL})
+LB_NET_TARBALL="${LB_NET_TARBALL}"
-# \$LH_SYSLINUX_SPLASH: set custom syslinux splash
+# \$LB_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
-LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
+LB_SYSLINUX_SPLASH="${LB_SYSLINUX_SPLASH}"
-# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
+# \$LB_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
# (Default: 0)
-LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT}"
+LB_SYSLINUX_TIMEOUT="${LB_SYSLINUX_TIMEOUT}"
-# \$LH_SYSLINUX_CFG: set custom syslinux configuration file
+# \$LB_SYSLINUX_CFG: set custom syslinux configuration file
# (Default: empty)
-LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG}"
+LB_SYSLINUX_CFG="${LB_SYSLINUX_CFG}"
-# \$LH_SYSLINUX_MENU: set syslinux menu
-# (Default: ${LH_SYSLINUX_MENU})
-LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU}"
+# \$LB_SYSLINUX_MENU: set syslinux menu
+# (Default: ${LB_SYSLINUX_MENU})
+LB_SYSLINUX_MENU="${LB_SYSLINUX_MENU}"
-# \$LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
-# (Default: ${LH_SYSLINUX_MENU_LIVE_ENTRY})
-LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY}"
+# \$LB_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
+# (Default: ${LB_SYSLINUX_MENU_LIVE_ENTRY})
+LB_SYSLINUX_MENU_LIVE_ENTRY="${LB_SYSLINUX_MENU_LIVE_ENTRY}"
-# \$LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
-# (Default: ${LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY})
-LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY="${LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY}"
+# \$LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
+# (Default: ${LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY})
+LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY="${LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY}"
-# \$LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
-# (Default: ${LH_SYSLINUX_MENU_MEMTEST_ENTRY})
-LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY}"
+# \$LB_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
+# (Default: ${LB_SYSLINUX_MENU_MEMTEST_ENTRY})
+LB_SYSLINUX_MENU_MEMTEST_ENTRY="${LB_SYSLINUX_MENU_MEMTEST_ENTRY}"
-# \$LH_USERNAME: set username
-# (Default: ${LH_USERNAME})
-LH_USERNAME="${LH_USERNAME}"
+# \$LB_USERNAME: set username
+# (Default: ${LB_USERNAME})
+LB_USERNAME="${LB_USERNAME}"
EOF
# Creating lh_source_* configuration
cat > config/source << EOF
# config/source - options for live-build(7), source stage
-# \$LH_SOURCE: set source option
-# (Default: ${LH_SOURCE})
-LH_SOURCE="${LH_SOURCE}"
+# \$LB_SOURCE: set source option
+# (Default: ${LB_SOURCE})
+LB_SOURCE="${LB_SOURCE}"
-# \$LH_SOURCE_IMAGES: set image type
-# (Default: ${LH_SOURCE_IMAGES})
-LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
+# \$LB_SOURCE_IMAGES: set image type
+# (Default: ${LB_SOURCE_IMAGES})
+LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
EOF
mkdir -p auto/functions
@@ -1312,7 +1312,7 @@ if [ "${CONFIG}" = "clone" ] # FIXME
then
# Read package selection
echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packageslists/local-system
- LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS} local-system"
+ LB_PACKAGES_LISTS="${LB_PACKAGES_LISTS} local-system"
# Read debconf questions
if [ ! -f /usr/bin/debconf-get-selections ]
@@ -1327,13 +1327,13 @@ if [ "${BACKPORTS}" = "true" ]
then
# Adding sources.list entry
-cat > config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot << EOF
+cat > config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot << EOF
# Backports Maintainers
-deb http://backports.debian-maintainers.org/ ${LH_DISTRIBUTION}/backports main contrib non-free
-deb-src http://backports.debian-maintainers.org/ ${LH_DISTRIBUTION}/backports main contrib non-free
+deb http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
+deb-src http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
EOF
- cp config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot config/chroot_sources/${LH_DISTRIBUTION}-backports.binary
+ cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot config/chroot_sources/${LB_DISTRIBUTION}-backports.binary
# Adding apt preferences
if ! grep -qs "^Pin: release o=backports.debian-maintainerns.org" config/chroot_apt/preferences
@@ -1348,8 +1348,8 @@ EOF
fi
# Addding archive signing key
- wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot.gpg
- cp config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LH_DISTRIBUTION}-backports.binary.gpg
+ wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg
+ cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LB_DISTRIBUTION}-backports.binary.gpg
fi
# Checking defaults again
diff --git a/scripts/build/lb b/scripts/build/lb
index 7761802..9715fc2 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@@ -42,9 +42,9 @@ case "${1}" in
COMMAND="${1}"
shift
- if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ]
+ if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
then
- LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}"
+ LH=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}"
elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
then
LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
diff --git a/scripts/build/live-build b/scripts/build/live-build
index 41f0578..a0e480e 100755
--- a/scripts/build/live-build
+++ b/scripts/build/live-build
@@ -23,7 +23,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
if [ -x "$(which man 2>/dev/null)" ]
then
diff --git a/scripts/build/local b/scripts/build/local
index 990f29a..edae5ba 100755
--- a/scripts/build/local
+++ b/scripts/build/local
@@ -8,10 +8,10 @@
## under certain conditions; see COPYING for details.
-LH_BASE="${PWD}/live-build"
-PATH="${LH_BASE}/helpers:${PATH}"
+LB_BASE="${PWD}/live-build"
+PATH="${LB_BASE}/helpers:${PATH}"
-export LH_BASE PATH
+export LB_BASE PATH
if [ ! -z "${1}" ]
then
diff --git a/scripts/build/source b/scripts/build/source
index 6ca6cf7..00d2ce7 100755
--- a/scripts/build/source
+++ b/scripts/build/source
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source images')"
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
index 092f266..4997eea 100755
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'create source checksums')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_CHECKSUMS}" = "none" ] || [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_CHECKSUMS}" = "none" ] || [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
@@ -48,7 +48,7 @@ do
continue
fi
- for CHECKSUM in ${LH_CHECKSUMS}
+ for CHECKSUM in ${LB_CHECKSUMS}
do
Echo_message "Begin creating source ${CHECKSUM}sum.txt..."
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index da58fd1..ec14497 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'debian sources')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
@@ -53,9 +53,9 @@ fi
Chroot chroot "dpkg --get-selections" | awk '{ print $1 }' > source-selection.txt
cat >> source-selection.txt << EOF
-${LH_BOOTLOADER}
+${LB_BOOTLOADER}
live-helper
-${LH_INITRAMFS}
+${LB_INITRAMFS}
dosfstools
genisoimage
parted
@@ -64,7 +64,7 @@ genext2fs
mtd-tools
EOF
-case "${LH_ARCHITECTURE}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
cat >> source-selection.txt << EOF
@@ -73,9 +73,9 @@ syslinux
grub
EOF
- if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
+ if [ "${LB_MEMTEST}" != "false" ] && [ "${LB_MEMTEST}" != "none" ]
then
- echo "${LH_MEMTEST}" >> source-selection.txt
+ echo "${LB_MEMTEST}" >> source-selection.txt
fi
;;
@@ -93,9 +93,9 @@ EOF
;;
esac
-if [ -n "${LH_TASKS}" ]
+if [ -n "${LB_TASKS}" ]
then
- echo "${LH_TASKSEL}" >> source-selection.txt
+ echo "${LB_TASKSEL}" >> source-selection.txt
fi
MISSING=""
diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live
index 7a0d8f2..f750c86 100755
--- a/scripts/build/source_debian-live
+++ b/scripts/build/source_debian-live
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'copy debian-live config into source')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index a915e86..edc7f0d 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'install disk information into source')"
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-case "${LH_SOURCE_IMAGES}" in
+case "${LB_SOURCE_IMAGES}" in
iso*|usb*)
;;
@@ -50,11 +50,11 @@ Create_lockfile .lock
mkdir -p source/.disk
TITLE="Debian GNU/Linux"
-DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
-DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
-eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
+DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
+DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
+eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
-case "${LH_MODE}" in
+case "${LB_MODE}" in
debian)
STRING="Official Snapshot ${ARCHITECTURE}"
TRACE="project/trace/ftp-master.debian.org"
@@ -79,11 +79,11 @@ esac
if [ -n "${TRACE}" ]
then
- echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ echo "$(wget -q ${LB_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
> source/.disk/archive_trace
fi
-case "${LH_DEBIAN_INSTALLER}" in
+case "${LB_DEBIAN_INSTALLER}" in
cdrom)
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
;;
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index d159cd1..0da2925 100755
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build iso source image')"
@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
-case "${LH_SOURCE_IMAGES}" in
+case "${LB_SOURCE_IMAGES}" in
iso*)
;;
@@ -74,24 +74,24 @@ then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
fi
-if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
+if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
fi
-if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
+if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\""
fi
-if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
+if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
fi
-if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
+if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
then
- GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi
# Moving image
diff --git a/scripts/build/source_net b/scripts/build/source_net
index cf47abc..aa425c4 100755
--- a/scripts/build/source_net
+++ b/scripts/build/source_net
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source net image')"
@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
-if ! In_list net "${LH_SOURCE_IMAGES}"
+if ! In_list net "${LB_SOURCE_IMAGES}"
then
exit 0
fi
diff --git a/scripts/build/source_tar b/scripts/build/source_tar
index cd0f398..4d45e2c 100755
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source tarball')"
@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
-if ! In_list tar "${LH_SOURCE_IMAGES}"
+if ! In_list tar "${LB_SOURCE_IMAGES}"
then
exit 0
fi
diff --git a/scripts/build/source_usb b/scripts/build/source_usb
index 219482e..eb18526 100755
--- a/scripts/build/source_usb
+++ b/scripts/build/source_usb
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source image')"
@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
-if ! In_list usb-hdd "${LH_SOURCE_IMAGES}"
+if ! In_list usb-hdd "${LB_SOURCE_IMAGES}"
then
exit 0
fi
@@ -63,9 +63,9 @@ fi
# Everything which comes here needs to be cleaned up,
DU_DIM="$(du -ms source | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
+REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})"
dd if=/dev/zero of=source.img bs=1024k count=0 seek=${REAL_DIM}
-FREELO="$(${LH_LOSETUP} -f)"
+FREELO="$(${LB_LOSETUP} -f)"
if [ ! -b chroot/${FREELO} ]
then
MAKEDEV="true"
@@ -74,17 +74,17 @@ then
find /dev | cpio -dmpu chroot
fi
-case "${LH_BINARY_FILESYSTEM}" in
+case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
PARTITION_TYPE="ext2"
;;
fat16|fat32)
- PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
+ PARTITION_TYPE="${LB_BINARY_FILESYSTEM}"
;;
*)
- Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
+ Echo_error "Unsupported binary filesystem %s" "${LB_BINARY_FILESYSTEM}"
exit 1
;;
esac
@@ -95,13 +95,13 @@ Chroot chroot "parted -s ${FREELO} mklabel msdos" || true
Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
sleep 1
-${LH_LOSETUP} -d ${FREELO}
+${LB_LOSETUP} -d ${FREELO}
Losetup $FREELO source.img 1
-case "${LH_BINARY_FILESYSTEM}" in
+case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
- MKFS="${LH_BINARY_FILESYSTEM}"
+ MKFS="${LB_BINARY_FILESYSTEM}"
MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
;;
@@ -119,12 +119,12 @@ esac
Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
mkdir -p source.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+${LB_ROOT_COMMAND} mount ${FREELO} source.tmp
cp -r source/* source.tmp
-${LH_ROOT_COMMAND} umount source.tmp
+${LB_ROOT_COMMAND} umount source.tmp
rmdir source.tmp
sleep 1
-${LH_LOSETUP} -d ${FREELO}
+${LB_LOSETUP} -d ${FREELO}
Echo_warning "!!! The above error/warning messages can be ignored !!!"
if [ -n "${MAKEDEV}" ]
diff --git a/scripts/build/source_virtual-hdd b/scripts/build/source_virtual-hdd
index 8434468..babd8eb 100755
--- a/scripts/build/source_virtual-hdd
+++ b/scripts/build/source_virtual-hdd
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'build source image')"
@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE}" != "true" ]
+if [ "${LB_SOURCE}" != "true" ]
then
exit 0
fi
-if ! In_list virtual-hdd "${LH_SOURCE_IMAGES}"
+if ! In_list virtual-hdd "${LB_SOURCE_IMAGES}"
then
exit 0
fi
@@ -48,9 +48,9 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3)
Check_package chroot/sbin/mkfs.ext2 e2fsprogs
;;
@@ -68,14 +68,14 @@ fi
# Everything which comes here needs to be cleaned up,
DU_DIM="$(du -ms source | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
+REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})"
dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM}
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
mv source-virtual.img chroot
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2)
Chroot chroot "mkfs.ext2 -F -m 0 source-virtual.img"
;;
@@ -87,7 +87,7 @@ then
mv chroot/source-virtual.img ./
else
- case "${LH_BINARY_FILESYSTEM}" in
+ case "${LB_BINARY_FILESYSTEM}" in
ext2)
mkfs.ext2 -F -m 0 source-virtual.img
;;
@@ -99,10 +99,10 @@ else
fi
mkdir -p source.tmp
-${LH_ROOT_COMMAND} mount -o loop source-virtual.img source.tmp
+${LB_ROOT_COMMAND} mount -o loop source-virtual.img source.tmp
cp -r source/* source.tmp
-${LH_ROOT_COMMAND} umount source.tmp
+${LB_ROOT_COMMAND} umount source.tmp
rmdir source.tmp
# Saving cache
diff --git a/scripts/build/testroot b/scripts/build/testroot
index 7a67999..52a05d2 100755
--- a/scripts/build/testroot
+++ b/scripts/build/testroot
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'ensure that a system is built as root')"
@@ -25,7 +25,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
Set_defaults
# Checking user account
-if [ "$(${LH_ROOT_COMMAND} id -u)" -ne "0" ]
+if [ "$(${LB_ROOT_COMMAND} id -u)" -ne "0" ]
then
Echo_error "need root privileges"
exit 1
diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html
index 866938f..3fbb138 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -12,57 +12,57 @@
<table>
<tr><td>Email: </td><td>EMAIL</td></tr>
- <tr><td>--binary-image: </td><td>LH_BINARY_IMAGES</td></tr>
- <tr><td>--distribution: </td><td>LH_DISTRIBUTION</td></tr>
- <tr><td>--packages-lists: </td><td>LH_PACKAGES_LISTS</td></tr>
- <tr><td>--tasks: </td><td>LH_TASKS</td><tr>
- <tr><td>--packages: </td><td>LH_PACKAGES</td><tr>
+ <tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
+ <tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
+ <tr><td>--packages-lists: </td><td>LB_PACKAGES_LISTS</td></tr>
+ <tr><td>--tasks: </td><td>LB_TASKS</td><tr>
+ <tr><td>--packages: </td><td>LB_PACKAGES</td><tr>
</table>
<b>Advanced bootstrap options</b>
<table>
- <tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
- <tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
- <tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
- <tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
- <tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
- <tr><td>--archive-areas: </td><td>LH_ARCHIVE_AREAS</td></tr>
+ <tr><td>--architecture: </td><td>LB_ARCHITECTURE</td></tr>
+ <tr><td>--bootstrap-flavour: </td><td>LB_BOOTSTRAP_FLAVOUR</td></tr>
+ <tr><td>--mirror-bootstrap: </td><td>LB_MIRROR_BOOTSTRAP</td></tr>
+ <tr><td>--mirror-binary: </td><td>LB_MIRROR_BINARY</td></tr>
+ <tr><td>--mirror-binary-security: </td><td>LB_MIRROR_BINARY_SECURITY</td></tr>
+ <tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
</table>
<b>Advanced chroot options</b>
<table>
- <tr><td>--chroot-fileystem: </td><td>LH_CHROOT_FILESYSTEM</td></tr>
- <tr><td>--linux-flavours: </td><td>LH_LINUX_FLAVOURS</td></tr>
- <tr><td>--security: </td><td>LH_SECURITY</td></tr>
- <tr><td>--symlinks: </td><td>LH_SYMLINKS</td></tr>
- <tr><td>--sysvinit: </td><td>LH_SYSVINIT</td></tr>
+ <tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
+ <tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
+ <tr><td>--security: </td><td>LB_SECURITY</td></tr>
+ <tr><td>--symlinks: </td><td>LB_SYMLINKS</td></tr>
+ <tr><td>--sysvinit: </td><td>LB_SYSVINIT</td></tr>
</table>
<b>Advanced binary options</b>
<table>
- <tr><td>--binary-indices: </td><td>LH_BINARY_INDICES</td></tr>
- <tr><td>--bootappend-live: </td><td>LH_BOOTAPPEND_LIVE</td></tr>
- <tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr>
- <tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr>
- <tr><td>--bootappend-install: </td><td>LH_BOOTAPPEND_INSTALL</td></tr>
- <tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr>
- <tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr>
- <tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr>
- <tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr>
- <tr><td>--iso-volume: </td><td>LH_ISO_VOLUME</td></tr>
- <tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
- <tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
- <tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
+ <tr><td>--binary-indices: </td><td>LB_BINARY_INDICES</td></tr>
+ <tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
+ <tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
+ <tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
+ <tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
+ <tr><td>--encryption: </td><td>LB_ENCRYPTION</td></tr>
+ <tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
+ <tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
+ <tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
+ <tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
+ <tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
+ <tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
+ <tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
</table>
<b>Advanced source options</b>
<table>
- <tr><td>--source: </td><td>LH_SOURCE</td></tr>
- <tr><td>--source-images: </td><td>LH_SOURCE_IMAGES</td></tr>
+ <tr><td>--source: </td><td>LB_SOURCE</td></tr>
+ <tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
</table>
</fieldset>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index fca9d2d..4c8018d 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -113,15 +113,15 @@
</tr>
<tr>
<td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td>
- <td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
+ <td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LB_MIRROR_BOOTSTRAP" readonly /></td>
</tr>
<tr>
<td><label for="Mirror_Binary">--mirror-binary:</label> </td>
- <td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" /></td>
+ <td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY" /></td>
</tr>
<tr>
<td><label for="Mirror_Binary_Security">--mirror-binary-security:</label> </td>
- <td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY_SECURITY" readonly /></td>
+ <td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY_SECURITY" readonly /></td>
</tr>
<tr>
<td><label for="Archive_Areas">--archive-areas:</label> </td>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index 45b8d19..de2c9f5 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -12,57 +12,57 @@
<table>
<tr><td>Email: </td><td>EMAIL</td></tr>
- <tr><td>--binary-image: </td><td>LH_BINARY_IMAGES</td></tr>
- <tr><td>--distribution: </td><td>LH_DISTRIBUTION</td></tr>
- <tr><td>--packages-lists: </td><td>LH_PACKAGES_LISTS</td></tr>
- <tr><td>--tasks: </td><td>LH_TASKS</td><tr>
- <tr><td>--packages: </td><td>LH_PACKAGES</td><tr>
+ <tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
+ <tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
+ <tr><td>--packages-lists: </td><td>LB_PACKAGES_LISTS</td></tr>
+ <tr><td>--tasks: </td><td>LB_TASKS</td><tr>
+ <tr><td>--packages: </td><td>LB_PACKAGES</td><tr>
</table>
<b>Advanced bootstrap options</b>
<table>
- <tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
- <tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
- <tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
- <tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
- <tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
- <tr><td>--archive-areas: </td><td>LH_ARCHIVE_AREAS</td></tr>
+ <tr><td>--architecture: </td><td>LB_ARCHITECTURE</td></tr>
+ <tr><td>--bootstrap-flavour: </td><td>LB_BOOTSTRAP_FLAVOUR</td></tr>
+ <tr><td>--mirror-bootstrap: </td><td>LB_MIRROR_BOOTSTRAP</td></tr>
+ <tr><td>--mirror-binary: </td><td>LB_MIRROR_BINARY</td></tr>
+ <tr><td>--mirror-binary-security: </td><td>LB_MIRROR_BINARY_SECURITY</td></tr>
+ <tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
</table>
<b>Advanced chroot options</b>
<table>
- <tr><td>--chroot-fileystem: </td><td>LH_CHROOT_FILESYSTEM</td></tr>
- <tr><td>--linux-flavours: </td><td>LH_LINUX_FLAVOURS</td></tr>
- <tr><td>--security: </td><td>LH_SECURITY</td></tr>
- <tr><td>--symlinks: </td><td>LH_SYMLINKS</td></tr>
- <tr><td>--sysvinit: </td><td>LH_SYSVINIT</td></tr>
+ <tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
+ <tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
+ <tr><td>--security: </td><td>LB_SECURITY</td></tr>
+ <tr><td>--symlinks: </td><td>LB_SYMLINKS</td></tr>
+ <tr><td>--sysvinit: </td><td>LB_SYSVINIT</td></tr>
</table>
<b>Advanced binary options</b>
<table>
- <tr><td>--binary-indices: </td><td>LH_BINARY_INDICES</td></tr>
- <tr><td>--bootappend-live: </td><td>LH_BOOTAPPEND_LIVE</td></tr>
- <tr><td>--bootloader: </td><td>LH_BOOTLOADER</td></tr>
- <tr><td>--debian-installer: </td><td>LH_DEBIAN_INSTALLER</td></tr>
- <tr><td>--bootappend-install: </td><td>LH_BOOTAPPEND_INSTALL</td></tr>
- <tr><td>--encryption: </td><td>LH_ENCRYPTION</td></tr>
- <tr><td>--iso-application: </td><td>LH_ISO_APPLICATION</td></tr>
- <tr><td>--iso-preparer: </td><td>LH_ISO_PREPARER</td></tr>
- <tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr>
- <tr><td>--iso-volume: </td><td>LH_ISO_VOLUME</td></tr>
- <tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
- <tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
- <tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
+ <tr><td>--binary-indices: </td><td>LB_BINARY_INDICES</td></tr>
+ <tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
+ <tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
+ <tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
+ <tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
+ <tr><td>--encryption: </td><td>LB_ENCRYPTION</td></tr>
+ <tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
+ <tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
+ <tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
+ <tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
+ <tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
+ <tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
+ <tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
</table>
<b>Advanced source options</b>
<table>
- <tr><td>--source: </td><td>LH_SOURCE</td></tr>
- <tr><td>--source-images: </td><td>LH_SOURCE_IMAGES</td></tr>
+ <tr><td>--source: </td><td>LB_SOURCE</td></tr>
+ <tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
</table>
<b>Unofficial options</b>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index df11f67..acb3ccf 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -112,15 +112,15 @@
</tr>
<tr>
<td><label for="Mirror_Bootstrap">--mirror-bootstrap:</label> </td>
- <td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
+ <td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LB_MIRROR_BOOTSTRAP" readonly /></td>
</tr>
<tr>
<td><label for="Mirror_Binary">--mirror-binary:</label> </td>
- <td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" /></td>
+ <td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY" /></td>
</tr>
<tr>
<td><label for="Mirror_Binary_Security">--mirror-binary-security:</label> </td>
- <td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY_SECURITY" readonly /></td>
+ <td><input id="Mirror_Binary_Security" name="mirror_binary_security" maxlength="256" size="50" type="text" value="LB_MIRROR_BINARY_SECURITY" readonly /></td>
</tr>
<tr>
<td><label for="Archive_Areas">--archive-areas:</label> </td>
diff --git a/templates/silo/debian.txt b/templates/silo/debian.txt
index fb2a49c..459adf5 100644
--- a/templates/silo/debian.txt
+++ b/templates/silo/debian.txt
@@ -1,8 +1,8 @@
Welcome to Debian GNU/Linux!
-This is a Debian LH_DISTRIBUTION live image.
-It was built on LH_DATE by live-build LH_VERSION.
+This is a Debian LB_DISTRIBUTION live image.
+It was built on LB_DATE by live-build LB_VERSION.
You must have at least 64 megabytes of RAM to run this Debian Live system.
diff --git a/templates/silo/debian.txt.install b/templates/silo/debian.txt.install
index be095f9..a8d1bb6 100644
--- a/templates/silo/debian.txt.install
+++ b/templates/silo/debian.txt.install
@@ -1,8 +1,8 @@
Welcome to Debian GNU/Linux!
-This is a Debian LH_DISTRIBUTION combined live and installation image.
-It was built on LH_DATE by live-build LH_VERSION.
+This is a Debian LB_DISTRIBUTION combined live and installation image.
+It was built on LB_DATE by live-build LB_VERSION.
You must have at least 64 megabytes of RAM to run this Debian Live system.
diff --git a/templates/syslinux/ca/f1.txt.install b/templates/syslinux/ca/f1.txt.install
index 89b0aaa..383ce1c 100644
--- a/templates/syslinux/ca/f1.txt.install
+++ b/templates/syslinux/ca/f1.txt.install
@@ -1,7 +1,7 @@
0fBenvingut a Debian GNU/Linux!07 09F107
-Aix• ‚s un Debian {$LH_DISTRIBUTION} combinat live i d'instalúlaci¢ dins un {$LH_MEDIA}.
-Fet el {$LH_DATE}.
+Aix• ‚s un Debian {$LB_DISTRIBUTION} combinat live i d'instalúlaci¢ dins un {$LB_MEDIA}.
+Fet el {$LB_DATE}.
0fMEN£ DE LES AJUDES07
@@ -9,7 +9,7 @@ Fet el {$LH_DATE}.
<09F107> Aquesta p…gina, l'¡ndex.
<09F207> Prerequisits per instalúlar Debian.
-<09F307> MŠtodes d'arrencada per a usos especials d'aquest {$LH_MEDIA}.
+<09F307> MŠtodes d'arrencada per a usos especials d'aquest {$LB_MEDIA}.
<09F407> MŠtodes addicionals d'arrencada; mode de rescat.
<09F507> Rep…s dels par…metres especials d'arrencada.
<09F607> Par…metres especials per algunes m…quines.
diff --git a/templates/syslinux/ca/f1.txt.live b/templates/syslinux/ca/f1.txt.live
index 327dd0f..f7b7525 100644
--- a/templates/syslinux/ca/f1.txt.live
+++ b/templates/syslinux/ca/f1.txt.live
@@ -1,7 +1,7 @@
0fBenvingut a Debian GNU/Linux!07 09F107
-Aix• ‚s una Debian {$LH_DISTRIBUTION} live dins un {$LH_MEDIA}.
-Fet el {$LH_DATE}.
+Aix• ‚s una Debian {$LB_DISTRIBUTION} live dins un {$LB_MEDIA}.
+Fet el {$LB_DATE}.
0fMEN£ DE LES AJUDES07
@@ -9,7 +9,7 @@ Fet el {$LH_DATE}.
<09F107> Aquesta p…gina, l'¡ndex.
<09F207> Prerequisits per instalúlar Debian.
-<09F307> MŠtodes d'arrencada per a usos especials d'aquest {$LH_MEDIA}
+<09F307> MŠtodes d'arrencada per a usos especials d'aquest {$LB_MEDIA}
<09F407> MŠtodes addicionals d'arrencada.
<09F507> Rep…s dels par…metres especials d'arrencada.
<09F607> Par…metres especials per algunes m…quines.
diff --git a/templates/syslinux/ca/f10.txt b/templates/syslinux/ca/f10.txt
index 3f438a9..217d106 100644
--- a/templates/syslinux/ca/f10.txt
+++ b/templates/syslinux/ca/f10.txt
@@ -12,7 +12,7 @@ la llei aplicable.
---
-Aquest sistema Debian Live ha estat constru‹t amb live-build, versi¢ {$LH_VERSION}.
+Aquest sistema Debian Live ha estat constru‹t amb live-build, versi¢ {$LB_VERSION}.
M‚s informaci¢ del projecte Debian Live es pot trobar a
<http://live.debian.net/>.
diff --git a/templates/syslinux/ca/f3.txt.install b/templates/syslinux/ca/f3.txt.install
index efe30c4..9700bb2 100644
--- a/templates/syslinux/ca/f3.txt.install
+++ b/templates/syslinux/ca/f3.txt.install
@@ -3,7 +3,7 @@
0fMŠtodes d'arrancada disponibles:07
0flive07
- Inicia el sistema live -- aquest es el mŠtode de {$LH_MEDIA} per defecte.
+ Inicia el sistema live -- aquest es el mŠtode de {$LB_MEDIA} per defecte.
0flivefailsafe07
Inicia el sistema en mode a prova de falles.
0finstall07
diff --git a/templates/syslinux/ca/f3.txt.install.g-i b/templates/syslinux/ca/f3.txt.install.g-i
index 9138eb5..1dc0d97 100644
--- a/templates/syslinux/ca/f3.txt.install.g-i
+++ b/templates/syslinux/ca/f3.txt.install.g-i
@@ -3,7 +3,7 @@
0fMŠtodes d'arrancada disponibles:07
0flive07
- Inicia el sistema live -- aquest es el mŠtode de {$LH_MEDIA} per defecte.
+ Inicia el sistema live -- aquest es el mŠtode de {$LB_MEDIA} per defecte.
0flivefailsafe07
Inicia el sistema en mode a prova de falles.
0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/ca/f3.txt.live b/templates/syslinux/ca/f3.txt.live
index bb3e23a..43e8cff 100644
--- a/templates/syslinux/ca/f3.txt.live
+++ b/templates/syslinux/ca/f3.txt.live
@@ -3,7 +3,7 @@
0fMŠtodes d'arrancada disponibles:07
0flive07
- Inicia el sistema live -- aquest es el mŠtode de {$LH_MEDIA} per defecte.
+ Inicia el sistema live -- aquest es el mŠtode de {$LB_MEDIA} per defecte.
0flivefailsafe07
Inicia el sistema en mode a prova de falles.
diff --git a/templates/syslinux/en/f1.txt.install b/templates/syslinux/en/f1.txt.install
index 3d3965f..d31cefa 100644
--- a/templates/syslinux/en/f1.txt.install
+++ b/templates/syslinux/en/f1.txt.install
@@ -1,7 +1,7 @@
0fWelcome to Debian GNU/Linux!07 09F107
-This is a Debian {$LH_DISTRIBUTION} combined live and installation {$LH_MEDIA}.
-It was built on {$LH_DATE}.
+This is a Debian {$LB_DISTRIBUTION} combined live and installation {$LB_MEDIA}.
+It was built on {$LB_DATE}.
0fHELP INDEX07
@@ -9,7 +9,7 @@ It was built on {$LH_DATE}.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this {$LH_MEDIA}
+<09F307> Boot methods for special ways of using this {$LB_MEDIA}
<09F407> Additional boot methods; rescue mode.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
diff --git a/templates/syslinux/en/f1.txt.live b/templates/syslinux/en/f1.txt.live
index 8c550e0..4075fee 100644
--- a/templates/syslinux/en/f1.txt.live
+++ b/templates/syslinux/en/f1.txt.live
@@ -1,7 +1,7 @@
0fWelcome to Debian GNU/Linux!07 09F107
-This is a Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
-It was built on {$LH_DATE}.
+This is a Debian {$LB_DISTRIBUTION} live {$LB_MEDIA}.
+It was built on {$LB_DATE}.
0fHELP INDEX07
@@ -9,7 +9,7 @@ It was built on {$LH_DATE}.
<09F107> This page, the help index.
<09F207> Prerequisites for installing Debian.
-<09F307> Boot methods for special ways of using this {$LH_MEDIA}
+<09F307> Boot methods for special ways of using this {$LB_MEDIA}
<09F407> Additional boot methods.
<09F507> Special boot parameters, overview.
<09F607> Special boot parameters for special machines.
diff --git a/templates/syslinux/en/f10.txt b/templates/syslinux/en/f10.txt
index d24850b..6780e67 100644
--- a/templates/syslinux/en/f10.txt
+++ b/templates/syslinux/en/f10.txt
@@ -12,7 +12,7 @@ permitted by applicable law.
---
-This Debian Live system was built with live-build, version {$LH_VERSION}.
+This Debian Live system was built with live-build, version {$LB_VERSION}.
More information about the Debian Live project can be found at
<http://live.debian.net/>.
diff --git a/templates/syslinux/en/f3.txt.install b/templates/syslinux/en/f3.txt.install
index 59c2d27..847c6ef 100644
--- a/templates/syslinux/en/f3.txt.install
+++ b/templates/syslinux/en/f3.txt.install
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default {$LH_MEDIA} method.
+ Start the live system -- this is the default {$LB_MEDIA} method.
0flivefailsafe07
Start the live system in fail-safe mode.
0finstall07
diff --git a/templates/syslinux/en/f3.txt.install.g-i b/templates/syslinux/en/f3.txt.install.g-i
index 2a49e50..e5fa7ba 100644
--- a/templates/syslinux/en/f3.txt.install.g-i
+++ b/templates/syslinux/en/f3.txt.install.g-i
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default {$LH_MEDIA} method.
+ Start the live system -- this is the default {$LB_MEDIA} method.
0flivefailsafe07
Start the live system in fail-safe mode.
0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/en/f3.txt.live b/templates/syslinux/en/f3.txt.live
index 87a17d0..d602ccc 100644
--- a/templates/syslinux/en/f3.txt.live
+++ b/templates/syslinux/en/f3.txt.live
@@ -3,7 +3,7 @@
0fAvailable boot methods:07
0flive07
- Start the live system -- this is the default {$LH_MEDIA} method.
+ Start the live system -- this is the default {$LB_MEDIA} method.
0flivefailsafe07
Start the live system in fail-safe mode.
diff --git a/templates/syslinux/es/f1.txt.install b/templates/syslinux/es/f1.txt.install
index eb84626..da9c0e4 100644
--- a/templates/syslinux/es/f1.txt.install
+++ b/templates/syslinux/es/f1.txt.install
@@ -1,7 +1,7 @@
0fBienvenido a Debian GNU/Linux!07 09F107
-Esto es una Debian {$LH_DISTRIBUTION} combinada live e instalaci¢n de {$LH_MEDIA}.
-Fue construida el {$LH_DATE}.
+Esto es una Debian {$LB_DISTRIBUTION} combinada live e instalaci¢n de {$LB_MEDIA}.
+Fue construida el {$LB_DATE}.
0fMEN£ DE AYUDA07
@@ -9,7 +9,7 @@ Fue construida el {$LH_DATE}.
<09F107> Esta p gina, el ¡ndice.
<09F207> Prerrequisitos para instalar Debian.
-<09F307> M‚todos de arranques especiales usando este {$LH_MEDIA}
+<09F307> M‚todos de arranques especiales usando este {$LB_MEDIA}
<09F407> M‚todos adicionales de arranque; modo de rescate.
<09F507> Repaso de los par metros especiales de arranque.
<09F607> Par metros especiales para algunas m quinas especiales.
diff --git a/templates/syslinux/es/f1.txt.live b/templates/syslinux/es/f1.txt.live
index a9099b3..378e34b 100644
--- a/templates/syslinux/es/f1.txt.live
+++ b/templates/syslinux/es/f1.txt.live
@@ -1,7 +1,7 @@
0fBienvenido a Debian GNU/Linux!07 09F107
-Esto es una Debian {$LH_DISTRIBUTION} live de {$LH_MEDIA}.
-Fue construida el {$LH_DATE}.
+Esto es una Debian {$LB_DISTRIBUTION} live de {$LB_MEDIA}.
+Fue construida el {$LB_DATE}.
0fMEN£ DE AYUDA07
@@ -9,7 +9,7 @@ Fue construida el {$LH_DATE}.
<09F107> Esta p gina, el ¡ndice.
<09F207> Prerrequisitos para instalar Debian.
-<09F307> M‚todos de arranques especiales usando este {$LH_MEDIA}.
+<09F307> M‚todos de arranques especiales usando este {$LB_MEDIA}.
<09F407> M‚todos adicionales de arranque.
<09F507> Repaso de los par metros especiales de arranque.
<09F607> Par metros especiales para algunas m quinas especiales.
diff --git a/templates/syslinux/es/f10.txt b/templates/syslinux/es/f10.txt
index b281306..36eedd7 100644
--- a/templates/syslinux/es/f10.txt
+++ b/templates/syslinux/es/f10.txt
@@ -12,7 +12,7 @@ permitido por la ley.
---
-Este sistema Debian Live se construy¢ con live-build, versi¢n {$LH_VERSION}.
+Este sistema Debian Live se construy¢ con live-build, versi¢n {$LB_VERSION}.
M s informaci¢n en sobre el proyecto Debian Live puede encontrarse en
<http://live.debian.net/>.
diff --git a/templates/syslinux/es/f3.txt.install b/templates/syslinux/es/f3.txt.install
index eaabd69..86d8d48 100644
--- a/templates/syslinux/es/f3.txt.install
+++ b/templates/syslinux/es/f3.txt.install
@@ -3,7 +3,7 @@
0fM‚todos de arranque disponibles:07
0flive07
- Inicia el sistema live -- ‚ste es el sistema en {$LH_MEDIA} predeterminado.
+ Inicia el sistema live -- ‚ste es el sistema en {$LB_MEDIA} predeterminado.
0flivefailsafe07
Inicia el sistema live en modo a prueba de fallos.
0finstall07
diff --git a/templates/syslinux/es/f3.txt.install.g-i b/templates/syslinux/es/f3.txt.install.g-i
index 6a7ade5..7b18708 100644
--- a/templates/syslinux/es/f3.txt.install.g-i
+++ b/templates/syslinux/es/f3.txt.install.g-i
@@ -3,7 +3,7 @@
0fM‚todos de arranque disponibles:07
0flive07
- Inicia el sistema live -- ‚ste es el sistema en {$LH_MEDIA} por defecto.
+ Inicia el sistema live -- ‚ste es el sistema en {$LB_MEDIA} por defecto.
0flivefailsafe07
Inicia el sistema live en modo a prueba de fallos.
0finstall07 or 0finstallgui07
diff --git a/templates/syslinux/es/f3.txt.live b/templates/syslinux/es/f3.txt.live
index 48da40c..e9291ae 100644
--- a/templates/syslinux/es/f3.txt.live
+++ b/templates/syslinux/es/f3.txt.live
@@ -3,7 +3,7 @@
0fM‚todos de arranque disponibles:07
0flive07
- Inicia el sistema live -- ‚ste es el sistema en {$LH_MEDIA} por defecto.
+ Inicia el sistema live -- ‚ste es el sistema en {$LB_MEDIA} por defecto.
0flivefailsafe07
Inicia el sistema live en modo a prueba de fallos.
diff --git a/templates/syslinux/menu/syslinux.cfg b/templates/syslinux/menu/syslinux.cfg
index fa55a7c..3397e3c 100644
--- a/templates/syslinux/menu/syslinux.cfg
+++ b/templates/syslinux/menu/syslinux.cfg
@@ -1,4 +1,4 @@
include menu.cfg
default {$LIVE_DATA_PATH}/vesamenu.c32
prompt 0
-timeout {$LH_SYSLINUX_TIMEOUT}
+timeout {$LB_SYSLINUX_TIMEOUT}
diff --git a/templates/syslinux/normal/prompt.cfg b/templates/syslinux/normal/prompt.cfg
index 0e82c43..5f64eb6 100644
--- a/templates/syslinux/normal/prompt.cfg
+++ b/templates/syslinux/normal/prompt.cfg
@@ -1,5 +1,5 @@
prompt 1
-timeout {$LH_SYSLINUX_TIMEOUT}
+timeout {$LB_SYSLINUX_TIMEOUT}
default live
display {$LIVE_SCREEN_PATH}/boot.txt
include {$LIVE_SCREEN_PATH}/menu.cfg
diff --git a/templates/syslinux/pt_BR/f1.txt.install b/templates/syslinux/pt_BR/f1.txt.install
index a5dd185..d21c1e8 100644
--- a/templates/syslinux/pt_BR/f1.txt.install
+++ b/templates/syslinux/pt_BR/f1.txt.install
@@ -1,7 +1,7 @@
0fBem vindo(a) ao Debian GNU/Linux!07 09F107
-Este é o Debian {$LH_DISTRIBUTION} combinando um sistema live e instalação
-{$LH_MEDIA}. Ele foi construÃdo em {$LH_DATE}.
+Este é o Debian {$LB_DISTRIBUTION} combinando um sistema live e instalação
+{$LB_MEDIA}. Ele foi construÃdo em {$LB_DATE}.
0fÃNDICE DE AJUDA07
@@ -9,7 +9,7 @@ Este é o Debian {$LH_DISTRIBUTION} combinando um sistema live e instalação
<09F107> Página atual, o Ãndice de ajuda.
<09F207> Pre-requisitos para instalar o Debian.
-<09F307> Métodos especiais de inicialização para usar neste {$LH_MEDIA}
+<09F307> Métodos especiais de inicialização para usar neste {$LB_MEDIA}
<09F407> Métodos adicionais de inicialização; modo de recuperação.
<09F507> Parâmetros de inicialização especiais, visão geral.
<09F607> Parâmetros de inicialização especiais para máquinas especÃficas.
diff --git a/templates/syslinux/pt_BR/f1.txt.live b/templates/syslinux/pt_BR/f1.txt.live
index a77aa64..db5c045 100644
--- a/templates/syslinux/pt_BR/f1.txt.live
+++ b/templates/syslinux/pt_BR/f1.txt.live
@@ -1,7 +1,7 @@
0fBem vindo(a) ao Debian GNU/Linux!07 09F107
-Este é o Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
-{$LH_MEDIA}. Ele foi construÃdo em {$LH_DATE}.
+Este é o Debian {$LB_DISTRIBUTION} live {$LB_MEDIA}.
+{$LB_MEDIA}. Ele foi construÃdo em {$LB_DATE}.
0fÃNDICE DE AJUDA07
@@ -9,7 +9,7 @@ Este é o Debian {$LH_DISTRIBUTION} live {$LH_MEDIA}.
<09F107> Página atual, o Ãndice de ajuda.
<09F207> Pre-requisitos para instalar o Debian.
-<09F307> Métodos especiais de inicialização para usar neste {$LH_MEDIA}
+<09F307> Métodos especiais de inicialização para usar neste {$LB_MEDIA}
<09F407> Métodos adicionais de inicialização.
<09F507> Parâmetros de inicialização especiais, visão geral.
<09F607> Parâmetros de inicialização especiais para máquinas especÃficas.
diff --git a/templates/syslinux/pt_BR/f10.txt b/templates/syslinux/pt_BR/f10.txt
index 245420e..a11b734 100644
--- a/templates/syslinux/pt_BR/f10.txt
+++ b/templates/syslinux/pt_BR/f10.txt
@@ -13,7 +13,7 @@ permitido pela lei aplicável.
---
-Este sistema Live do Debian foi construÃdo com live-build, versão {$LH_VERSION}.
+Este sistema Live do Debian foi construÃdo com live-build, versão {$LB_VERSION}.
Mais informações sobre o projeto Debian Live podem ser encontrada em
<http://live.debian.net/>.
diff --git a/templates/syslinux/pt_BR/f3.txt.install b/templates/syslinux/pt_BR/f3.txt.install
index 560feca..d6017f9 100644
--- a/templates/syslinux/pt_BR/f3.txt.install
+++ b/templates/syslinux/pt_BR/f3.txt.install
@@ -3,7 +3,7 @@
0fMétodos de inicilização disponÃveis:07
0flive07
- Inicia o sistema live -- este é o método {$LH_MEDIA} padrão.
+ Inicia o sistema live -- este é o método {$LB_MEDIA} padrão.
0flivefailsafe07
Inicia o sistema live em modo de segurança (fail-safe).
0finstall07
diff --git a/templates/syslinux/pt_BR/f3.txt.install.g-i b/templates/syslinux/pt_BR/f3.txt.install.g-i
index 205d3a8..9a6b7cc 100644
--- a/templates/syslinux/pt_BR/f3.txt.install.g-i
+++ b/templates/syslinux/pt_BR/f3.txt.install.g-i
@@ -3,7 +3,7 @@
0fmétodos de inicilização disponÃveis:07
0flive07
- Inicia o sistema live -- este é o método {$LH_MEDIA} padrão.
+ Inicia o sistema live -- este é o método {$LB_MEDIA} padrão.
0flivefailsafe07
Inicia o sistema live em modo de segurança (fail-safe).
0finstall07 ou 0finstallgui07
diff --git a/templates/syslinux/pt_BR/f3.txt.live b/templates/syslinux/pt_BR/f3.txt.live
index cdf791a..d83060d 100644
--- a/templates/syslinux/pt_BR/f3.txt.live
+++ b/templates/syslinux/pt_BR/f3.txt.live
@@ -3,7 +3,7 @@
0fMétodos de inicialização disponÃveis:07
0flive07
- Inicia o sistema live -- este é o método {$LH_MEDIA} padrão.
+ Inicia o sistema live -- este é o método {$LB_MEDIA} padrão.
0flivefailsafe07
Inicia o sistema live em modo de segurança (fail-safe).
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
index 98f5876..b183c67 100644
--- a/templates/yaboot/boot.msg
+++ b/templates/yaboot/boot.msg
@@ -1,7 +1,7 @@
Welcome to Debian GNU/Linux!
This is a Debian Live CDROM,
-built on LH_DATE.
+built on LB_DATE.
The default option is 'live'.
diff --git a/templates/yaboot/pegasos b/templates/yaboot/pegasos
index 1e1b241..a84396a 100644
--- a/templates/yaboot/pegasos
+++ b/templates/yaboot/pegasos
@@ -18,7 +18,7 @@
." Welcome to Debian GNU/Linux!" cr
." " cr
." This is a Debian Live CDROM," cr
- ." built on LH_DATE." cr
+ ." built on LB_DATE." cr
." " cr
." The default option is 'live'." cr
." " cr
--
live-build
More information about the debian-live-changes
mailing list