diff options
| -rwxr-xr-x | cgi/cron | 4 | ||||
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/binary | 98 | ||||
| -rwxr-xr-x | scripts/build/binary_rootfs | 168 | ||||
| -rwxr-xr-x | scripts/build/bootstrap | 10 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_cdebootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_copy | 2 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/build | 10 | ||||
| -rwxr-xr-x | scripts/build/chroot | 98 | ||||
| -rwxr-xr-x | scripts/build/chroot_devpts | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_proc | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_selinuxfs | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_sysfs | 2 | ||||
| -rwxr-xr-x | scripts/build/local | 2 | ||||
| -rwxr-xr-x | scripts/build/source | 32 |
16 files changed, 219 insertions, 219 deletions
@@ -97,9 +97,9 @@ then # Generating image cd "${_TEMPDIR}"/"${_BUILD}" - lh config -c ${_FILE} >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1 + lb config -c ${_FILE} >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1 _ERRORCONFIG="${?}" - lh build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1 + lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1 _ERRORBUILD="${?}" _DATE_END="`date -R`" diff --git a/functions/defaults.sh b/functions/defaults.sh index d73aee9..340e42a 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -498,7 +498,7 @@ Set_defaults () case "${LH_ARCHITECTURE}" in arm|armel) Echo_error "There is no default kernel flavour defined for your architecture." - Echo_error "Please configure it manually with 'lh config -k FLAVOUR'." + Echo_error "Please configure it manually with 'lb config -k FLAVOUR'." exit 1 ;; diff --git a/scripts/build/binary b/scripts/build/binary index 4a29040..52c627e 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -28,74 +28,74 @@ Set_defaults Setup_cleanup # Preparing root filesystem -lh binary_chroot ${*} +lb binary_chroot ${*} if [ "${LH_BUILD_WITH_CHROOT}" = "true" ] then # Configuring chroot - lh chroot_devpts install ${*} - lh chroot_proc install ${*} - lh chroot_selinuxfs install ${*} - lh chroot_sysfs install ${*} - lh chroot_hosts install ${*} - lh chroot_resolv install ${*} - lh chroot_hostname install ${*} - lh chroot_sysv-rc install ${*} - lh chroot_upstart install ${*} - lh chroot_apt install-binary ${*} - lh chroot_sources install ${*} + lb chroot_devpts install ${*} + lb chroot_proc install ${*} + lb chroot_selinuxfs install ${*} + lb chroot_sysfs install ${*} + lb chroot_hosts install ${*} + lb chroot_resolv install ${*} + lb chroot_hostname install ${*} + lb chroot_sysv-rc install ${*} + lb chroot_upstart install ${*} + lb chroot_apt install-binary ${*} + lb chroot_sources install ${*} fi # Building root filesystem -lh binary_rootfs ${*} -lh binary_manifest ${*} -lh binary_encryption ${*} +lb binary_rootfs ${*} +lb binary_manifest ${*} +lb binary_encryption ${*} # Prepare images -lh binary_local-packageslists ${*} -lh binary_linux-image ${*} -lh binary_debian-installer ${*} -lh binary_memtest ${*} -lh binary_grub ${*} -lh binary_grub2 ${*} -lh binary_syslinux ${*} -lh binary_yaboot ${*} -lh binary_silo ${*} -lh binary_disk ${*} -lh binary_win32-loader ${*} -lh binary_includes ${*} -lh binary_local-includes ${*} -lh binary_local-hooks ${*} -lh binary_checksums ${*} +lb binary_local-packageslists ${*} +lb binary_linux-image ${*} +lb binary_debian-installer ${*} +lb binary_memtest ${*} +lb binary_grub ${*} +lb binary_grub2 ${*} +lb binary_syslinux ${*} +lb binary_yaboot ${*} +lb binary_silo ${*} +lb binary_disk ${*} +lb binary_win32-loader ${*} +lb binary_includes ${*} +lb binary_local-includes ${*} +lb binary_local-hooks ${*} +lb binary_checksums ${*} if [ "${LH_BUILD_WITH_CHROOT}" != "true" ] then - lh chroot_devpts install ${*} - lh chroot_proc install ${*} - lh chroot_selinuxfs install ${*} - lh chroot_sysfs install ${*} + lb chroot_devpts install ${*} + lb chroot_proc install ${*} + lb chroot_selinuxfs install ${*} + lb chroot_sysfs install ${*} fi # Building images -lh binary_iso ${*} -lh binary_net ${*} -lh binary_tar ${*} -lh binary_usb ${*} -lh binary_virtual-hdd ${*} +lb binary_iso ${*} +lb binary_net ${*} +lb binary_tar ${*} +lb binary_usb ${*} +lb binary_virtual-hdd ${*} if [ "${LH_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot rm -f .stage/chroot_sources - lh chroot_hostname remove ${*} - lh chroot_resolv remove ${*} - lh chroot_hosts remove ${*} + lb chroot_hostname remove ${*} + lb chroot_resolv remove ${*} + lb chroot_hosts remove ${*} fi -lh chroot_apt remove ${*} -lh chroot_sysv-rc remove ${*} -lh chroot_sysfs remove ${*} -lh chroot_upstart remove ${*} -lh chroot_selinuxfs remove ${*} -lh chroot_proc remove ${*} -lh chroot_devpts remove ${*} +lb chroot_apt remove ${*} +lb chroot_sysv-rc remove ${*} +lb chroot_sysfs remove ${*} +lb chroot_upstart remove ${*} +lb chroot_selinuxfs remove ${*} +lb chroot_proc remove ${*} +lb chroot_devpts remove ${*} diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 750bc73..7b44be5 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -123,38 +123,38 @@ case "${LH_CHROOT_FILESYSTEM}" in rm -f .lock mv chroot/chroot chroot.tmp - lh chroot_linux-image remove ${*} - lh chroot_sources remove ${*} - lh chroot_apt remove ${*} - lh chroot_hostname remove ${*} - lh chroot_resolv remove ${*} - lh chroot_hosts remove ${*} - lh chroot_sysv-rc remove ${*} - lh chroot_upstart remove ${*} - lh chroot_dpkg remove ${*} - lh chroot_debianchroot remove ${*} - lh chroot_sysfs remove ${*} - lh chroot_selinuxfs remove ${*} - lh chroot_proc remove ${*} - lh chroot_devpts remove ${*} + lb chroot_linux-image remove ${*} + lb chroot_sources remove ${*} + lb chroot_apt remove ${*} + lb chroot_hostname remove ${*} + lb chroot_resolv remove ${*} + lb chroot_hosts remove ${*} + lb chroot_sysv-rc remove ${*} + lb chroot_upstart remove ${*} + lb chroot_dpkg remove ${*} + lb chroot_debianchroot remove ${*} + lb chroot_sysfs remove ${*} + lb chroot_selinuxfs remove ${*} + lb chroot_proc remove ${*} + lb chroot_devpts remove ${*} rm -rf chroot mv chroot.tmp chroot - lh chroot_devpts install ${*} - lh chroot_proc install ${*} - lh chroot_selinuxfs install ${*} - lh chroot_sysfs install ${*} - lh chroot_debianchroot install ${*} - lh chroot_dpkg install ${*} - lh chroot_sysv-rc install ${*} - lh chroot_upstart install ${*} - lh chroot_hosts install ${*} - lh chroot_resolv install ${*} - lh chroot_hostname install ${*} - lh chroot_apt install ${*} - lh chroot_sources install ${*} - lh chroot_linux-image install ${*} + lb chroot_devpts install ${*} + lb chroot_proc install ${*} + lb chroot_selinuxfs install ${*} + lb chroot_sysfs install ${*} + lb chroot_debianchroot install ${*} + lb chroot_dpkg install ${*} + lb chroot_sysv-rc install ${*} + lb chroot_upstart install ${*} + lb chroot_hosts install ${*} + lb chroot_resolv install ${*} + lb chroot_hostname install ${*} + lb chroot_apt install ${*} + lb chroot_sources install ${*} + lb chroot_linux-image install ${*} touch .lock else @@ -207,38 +207,38 @@ case "${LH_CHROOT_FILESYSTEM}" in rm -f .lock mv chroot/chroot chroot.tmp - lh chroot_linux-image remove ${*} - lh chroot_sources remove ${*} - lh chroot_apt remove ${*} - lh chroot_hostname remove ${*} - lh chroot_resolv remove ${*} - lh chroot_hosts remove ${*} - lh chroot_sysv-rc remove ${*} - lh chroot_upstart remove ${*} - lh chroot_dpkg remove ${*} - lh chroot_debianchroot remove ${*} - lh chroot_sysfs remove ${*} - lh chroot_selinuxfs remove ${*} - lh chroot_proc remove ${*} - lh chroot_devpts remove ${*} + lb chroot_linux-image remove ${*} + lb chroot_sources remove ${*} + lb chroot_apt remove ${*} + lb chroot_hostname remove ${*} + lb chroot_resolv remove ${*} + lb chroot_hosts remove ${*} + lb chroot_sysv-rc remove ${*} + lb chroot_upstart remove ${*} + lb chroot_dpkg remove ${*} + lb chroot_debianchroot remove ${*} + lb chroot_sysfs remove ${*} + lb chroot_selinuxfs remove ${*} + lb chroot_proc remove ${*} + lb chroot_devpts remove ${*} rm -rf chroot mv chroot.tmp chroot - lh chroot_devpts install ${*} - lh chroot_proc install ${*} - lh chroot_selinuxfs install ${*} - lh chroot_sysfs install ${*} - lh chroot_debianchroot install ${*} - lh chroot_dpkg install ${*} - lh chroot_sysv-rc install ${*} - lh chroot_upstart install ${*} - lh chroot_hosts install ${*} - lh chroot_resolv install ${*} - lh chroot_hostname install ${*} - lh chroot_apt install ${*} - lh chroot_sources install ${*} - lh chroot_linux-image install ${*} + lb chroot_devpts install ${*} + lb chroot_proc install ${*} + lb chroot_selinuxfs install ${*} + lb chroot_sysfs install ${*} + lb chroot_debianchroot install ${*} + lb chroot_dpkg install ${*} + lb chroot_sysv-rc install ${*} + lb chroot_upstart install ${*} + lb chroot_hosts install ${*} + lb chroot_resolv install ${*} + lb chroot_hostname install ${*} + lb chroot_apt install ${*} + lb chroot_sources install ${*} + lb chroot_linux-image install ${*} touch .lock else @@ -330,38 +330,38 @@ case "${LH_CHROOT_FILESYSTEM}" in rm -f .lock mv chroot/chroot chroot.tmp - lh chroot_linux-image remove ${*} - lh chroot_sources remove ${*} - lh chroot_apt remove ${*} - lh chroot_hostname remove ${*} - lh chroot_resolv remove ${*} - lh chroot_hosts remove ${*} - lh chroot_sysv-rc remove ${*} - lh chroot_upstart remove ${*} - lh chroot_dpkg remove ${*} - lh chroot_debianchroot remove ${*} - lh chroot_sysfs remove ${*} - lh chroot_selinuxfs remove ${*} - lh chroot_proc remove ${*} - lh chroot_devpts remove ${*} + lb chroot_linux-image remove ${*} + lb chroot_sources remove ${*} + lb chroot_apt remove ${*} + lb chroot_hostname remove ${*} + lb chroot_resolv remove ${*} + lb chroot_hosts remove ${*} + lb chroot_sysv-rc remove ${*} + lb chroot_upstart remove ${*} + lb chroot_dpkg remove ${*} + lb chroot_debianchroot remove ${*} + lb chroot_sysfs remove ${*} + lb chroot_selinuxfs remove ${*} + lb chroot_proc remove ${*} + lb chroot_devpts remove ${*} rm -rf chroot mv chroot.tmp chroot - lh chroot_devpts install ${*} - lh chroot_proc install ${*} - lh chroot_selinuxfs install ${*} - lh chroot_sysfs install ${*} - lh chroot_debianchroot install ${*} - lh chroot_dpkg install ${*} - lh chroot_sysv-rc install ${*} - lh chroot_upstart install ${*} - lh chroot_hosts install ${*} - lh chroot_resolv install ${*} - lh chroot_hostname install ${*} - lh chroot_apt install ${*} - lh chroot_sources install ${*} - lh chroot_linux-image install ${*} + lb chroot_devpts install ${*} + lb chroot_proc install ${*} + lb chroot_selinuxfs install ${*} + lb chroot_sysfs install ${*} + lb chroot_debianchroot install ${*} + lb chroot_dpkg install ${*} + lb chroot_sysv-rc install ${*} + lb chroot_upstart install ${*} + lb chroot_hosts install ${*} + lb chroot_resolv install ${*} + lb chroot_hostname install ${*} + lb chroot_apt install ${*} + lb chroot_sources install ${*} + lb chroot_linux-image install ${*} touch .lock else diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index 63a53c5..17370f6 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -28,8 +28,8 @@ Set_defaults Setup_cleanup # Bootstrapping system -lh bootstrap_cache restore ${*} -lh bootstrap_copy ${*} -lh bootstrap_cdebootstrap ${*} -lh bootstrap_debootstrap ${*} -lh bootstrap_cache save ${*} +lb bootstrap_cache restore ${*} +lb bootstrap_copy ${*} +lb bootstrap_cdebootstrap ${*} +lb bootstrap_debootstrap ${*} +lb bootstrap_cache save ${*} diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 79eab62..12800a7 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -37,7 +37,7 @@ Echo_message "Begin bootstrapping system..." Check_package /usr/bin/${LH_BOOTSTRAP} cdebootstrap # Ensure that a system is built as root -lh testroot +lb testroot # Checking stage file Check_stagefile .stage/bootstrap diff --git a/scripts/build/bootstrap_copy b/scripts/build/bootstrap_copy index fcf7c4a..249b9c4 100755 --- a/scripts/build/bootstrap_copy +++ b/scripts/build/bootstrap_copy @@ -35,7 +35,7 @@ Check_crossarchitecture Echo_message "Begin bootstrapping system..." # Ensure that a system is built as root -lh testroot +lb testroot # Checking stage file Check_stagefile .stage/bootstrap diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 85e9c9b..7157b3c 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -37,7 +37,7 @@ Echo_message "Begin bootstrapping system..." Check_package /usr/sbin/debootstrap debootstrap # Ensure that a system is built as root -lh testroot +lb testroot # Checking stage file Check_stagefile .stage/bootstrap diff --git a/scripts/build/build b/scripts/build/build index bba847a..c6720bf 100755 --- a/scripts/build/build +++ b/scripts/build/build @@ -17,7 +17,7 @@ set -e if [ -x auto/config ] && [ ! -e .stage/config ] then Echo_message "Automatically populating config tree." - lh config + lb config fi # Read meta config @@ -64,13 +64,13 @@ Set_defaults Check_defaults # Bootstrapping system -lh bootstrap ${*} +lb bootstrap ${*} # Customizing chroot -lh chroot ${*} +lb chroot ${*} # Building binary images -lh binary ${*} +lb binary ${*} # Building source images -lh source ${*} +lb source ${*} diff --git a/scripts/build/chroot b/scripts/build/chroot index 20b8dec..470663e 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -28,56 +28,56 @@ Set_defaults Setup_cleanup # Configuring chroot -lh chroot_cache restore ${*} -lh chroot_devpts install ${*} -lh chroot_proc install ${*} -lh chroot_selinuxfs install ${*} -lh chroot_sysfs install ${*} -lh chroot_debianchroot install ${*} -lh chroot_dpkg install ${*} -lh chroot_dpkg_tmpfs install ${*} -lh chroot_sysv-rc install ${*} -lh chroot_upstart install ${*} -lh chroot_hosts install ${*} -lh chroot_resolv install ${*} -lh chroot_hostname install ${*} -lh chroot_apt install ${*} -lh chroot_sources install ${*} -lh chroot_linux-image install ${*} +lb chroot_cache restore ${*} +lb chroot_devpts install ${*} +lb chroot_proc install ${*} +lb chroot_selinuxfs install ${*} +lb chroot_sysfs install ${*} +lb chroot_debianchroot install ${*} +lb chroot_dpkg install ${*} +lb chroot_dpkg_tmpfs install ${*} +lb chroot_sysv-rc install ${*} +lb chroot_upstart install ${*} +lb chroot_hosts install ${*} +lb chroot_resolv install ${*} +lb chroot_hostname install ${*} +lb chroot_apt install ${*} +lb chroot_sources install ${*} +lb chroot_linux-image install ${*} # Customizing chroot -lh chroot_preseed ${*} -lh chroot_local-preseed ${*} -lh chroot_tasks ${*} -lh chroot_packageslists ${*} -lh chroot_local-packageslists ${*} -lh chroot_packages ${*} -lh chroot_local-packages ${*} -lh chroot_install-packages ${*} -lh chroot_localization ${*} -lh chroot_local-includes ${*} -lh chroot_local-patches ${*} -lh chroot_sysvinit ${*} -lh chroot_local-hooks ${*} -lh chroot_hooks ${*} -lh chroot_symlinks ${*} -lh chroot_hacks ${*} -lh chroot_interactive ${*} +lb chroot_preseed ${*} +lb chroot_local-preseed ${*} +lb chroot_tasks ${*} +lb chroot_packageslists ${*} +lb chroot_local-packageslists ${*} +lb chroot_packages ${*} +lb chroot_local-packages ${*} +lb chroot_install-packages ${*} +lb chroot_localization ${*} +lb chroot_local-includes ${*} +lb chroot_local-patches ${*} +lb chroot_sysvinit ${*} +lb chroot_local-hooks ${*} +lb chroot_hooks ${*} +lb chroot_symlinks ${*} +lb chroot_hacks ${*} +lb chroot_interactive ${*} # Deconfiguring chroot -lh chroot_linux-image remove ${*} -lh chroot_sources remove ${*} -lh chroot_apt remove ${*} -lh chroot_hostname remove ${*} -lh chroot_resolv remove ${*} -lh chroot_hosts remove ${*} -lh chroot_sysv-rc remove ${*} -lh chroot_upstart remove ${*} -lh chroot_dpkg_tmpfs remove ${*} -lh chroot_dpkg remove ${*} -lh chroot_debianchroot remove ${*} -lh chroot_sysfs remove ${*} -lh chroot_selinuxfs remove ${*} -lh chroot_proc remove ${*} -lh chroot_devpts remove ${*} -lh chroot_cache save ${*} +lb chroot_linux-image remove ${*} +lb chroot_sources remove ${*} +lb chroot_apt remove ${*} +lb chroot_hostname remove ${*} +lb chroot_resolv remove ${*} +lb chroot_hosts remove ${*} +lb chroot_sysv-rc remove ${*} +lb chroot_upstart remove ${*} +lb chroot_dpkg_tmpfs remove ${*} +lb chroot_dpkg remove ${*} +lb chroot_debianchroot remove ${*} +lb chroot_sysfs remove ${*} +lb chroot_selinuxfs remove ${*} +lb chroot_proc remove ${*} +lb chroot_devpts remove ${*} +lb chroot_cache save ${*} diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts index 5703b34..ef864f4 100755 --- a/scripts/build/chroot_devpts +++ b/scripts/build/chroot_devpts @@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]" Arguments "${@}" # Ensure that a system is built as root -lh testroot +lb testroot # Reading configuration files Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc index 1279fb9..c46c9e5 100755 --- a/scripts/build/chroot_proc +++ b/scripts/build/chroot_proc @@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]" Arguments "${@}" # Ensure that a system is built as root -lh testroot +lb testroot # Reading configuration files Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 4b98b12..1fb263e 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]" Arguments "${@}" # Ensure that a system is built as root -lh testroot +lb testroot # Reading configuration files Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs index c20eec6..041bf97 100755 --- a/scripts/build/chroot_sysfs +++ b/scripts/build/chroot_sysfs @@ -21,7 +21,7 @@ USAGE="${PROGRAM} {install|remove} [--force]" Arguments "${@}" # Ensure that a system is built as root -lh testroot +lb testroot # Reading configuration files Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source diff --git a/scripts/build/local b/scripts/build/local index 9e90a00..990f29a 100755 --- a/scripts/build/local +++ b/scripts/build/local @@ -15,5 +15,5 @@ export LH_BASE PATH if [ ! -z "${1}" ] then - exec lh "${@}" + exec lb "${@}" fi diff --git a/scripts/build/source b/scripts/build/source index c64265a..6ca6cf7 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -30,26 +30,26 @@ Require_stagefile .stage/chroot_install-packages Setup_cleanup # Enabling network in chroot -lh chroot_hosts install ${*} -lh chroot_resolv install ${*} -lh chroot_hostname install ${*} -lh chroot_sources install ${*} +lb chroot_hosts install ${*} +lb chroot_resolv install ${*} +lb chroot_hostname install ${*} +lb chroot_sources install ${*} # Preparing images -lh source_debian-live ${*} -lh source_debian ${*} -lh source_disk ${*} -lh source_checksums ${*} +lb source_debian-live ${*} +lb source_debian ${*} +lb source_disk ${*} +lb source_checksums ${*} # Building images -lh source_iso ${*} -lh source_net ${*} -lh source_tar ${*} -lh source_usb ${*} -lh source_virtual-hdd ${*} +lb source_iso ${*} +lb source_net ${*} +lb source_tar ${*} +lb source_usb ${*} +lb source_virtual-hdd ${*} # Deconfiguring chroot rm -f .stage/chroot_sources -lh chroot_hostname remove ${*} -lh chroot_resolv remove ${*} -lh chroot_hosts remove ${*} +lb chroot_hostname remove ${*} +lb chroot_resolv remove ${*} +lb chroot_hosts remove ${*} |