diff options
Diffstat (limited to 'helpers')
66 files changed, 160 insertions, 3 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary index 4a1577dac..b51678937 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Preparing root filesystem diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index 150d6b1ef..c40afc998 100755 --- a/helpers/lh_binary_chroot +++ b/helpers/lh_binary_chroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin copying chroot..." diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 6ae67cd2a..b40787893 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Setting remote d-i directories diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index 5543949d2..65470be5a 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BINARY_IMAGES}" != "iso" ] diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index 0fb9b7efc..4d9a0e7f2 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ -z "${LH_ENCRYPTION}" ] diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index ccb7153b1..b3ea4a014 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTLOADER}" != "grub" ] diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index b426a6856..83f207eee 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_INCLUDES}" = "none" ] diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 7da3da809..8b00a3dcd 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index fb5ab98e5..33c2fbb9a 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin install linux-image..." @@ -108,7 +109,7 @@ case "${LH_INITRAMFS}" in casper) # Checking casper templates Check_templates casper - cp "${TEMPLATES}"/casper/parameters.txt "${DESTDIR}"/parameters.txt + cp "${TEMPLATES}"/parameters.txt "${DESTDIR}"/parameters.txt ;; live-initramfs) diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks index e7582476b..7e469b4e0 100755 --- a/helpers/lh_binary_local-hooks +++ b/helpers/lh_binary_local-hooks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing local hooks..." diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes index 84434c58c..6d0f34617 100755 --- a/helpers/lh_binary_local-includes +++ b/helpers/lh_binary_local-includes @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin copying binary local includes..." diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest index 779d2ed3f..0eabd8b23 100755 --- a/helpers/lh_binary_manifest +++ b/helpers/lh_binary_manifest @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin creating manifest..." diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index cb901c8e4..9b0d81dad 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin creating binary md5sum.txt..." @@ -54,7 +55,7 @@ fi # Calculating md5sums cd binary -find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt +find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs -I{} md5sum "{}" > ../md5sum.txt cat > md5sum.txt << EOF This file contains the list of md5 checksums of all files on this medium. diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index 28621f68a..298528538 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_MEMTEST}" = "disabled" ] @@ -60,11 +61,12 @@ fi if [ "${LH_CHROOT_BUILD}" = "enabled" ] then - if [ -f chroot/usr/sbin/grub ] && [ ! -d chroot/boot/grub ] + if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ] then GRUB="yes" mkdir -p chroot/boot/grub + touch chroot/boot/grub/menu.lst fi fi diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 40286d4af..2fb6e2cad 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs net diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 15feb5f73..f800709c1 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin building root filesystem image..." diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 0568de9fc..1f77ce8ca 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTLOADER}" != "syslinux" ] diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar index 34359350e..ed1cab8af 100755 --- a/helpers/lh_binary_tar +++ b/helpers/lh_binary_tar @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs tar diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index f13896c88..09c38f7a4 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs usb-hdd diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index dcdb839f5..73da4907a 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTLOADER}" != "yaboot" ] diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index c16f10c6a..4d9cf469f 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Bootstrapping system diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache index 03ae9040a..e6c8dcc9f 100755 --- a/helpers/lh_bootstrap_cache +++ b/helpers/lh_bootstrap_cache @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin caching bootstrap stage..." diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 37c8c79a2..dcc350d74 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ] diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy index c1991fbf9..d84916cc9 100755 --- a/helpers/lh_bootstrap_copy +++ b/helpers/lh_bootstrap_copy @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTSTRAP}" != "copy" ] diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index ad71962b4..7661025d3 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTSTRAP}" != "debootstrap" ] diff --git a/helpers/lh_chroot b/helpers/lh_chroot index a50f92db9..aafe71f05 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Configuring chroot @@ -37,6 +38,7 @@ lh_chroot_cache restore ${*} lh_chroot_proc install ${*} lh_chroot_sysfs install ${*} lh_chroot_debianchroot install ${*} +lh_chroot_dpkg install ${*} lh_chroot_sysv-rc install ${*} lh_chroot_hosts install ${*} lh_chroot_resolv install ${*} @@ -70,6 +72,7 @@ lh_chroot_hostname remove ${*} lh_chroot_resolv remove ${*} lh_chroot_hosts remove ${*} lh_chroot_sysv-rc remove ${*} +lh_chroot_dpkg remove ${*} lh_chroot_debianchroot remove ${*} lh_chroot_sysfs remove ${*} lh_chroot_proc remove ${*} diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 2534efd05..5ba5b0083 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache index 2f016a6f7..157a48ebd 100755 --- a/helpers/lh_chroot_cache +++ b/helpers/lh_chroot_cache @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin caching chroot stage..." diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot index 3a193a61b..beabbd286 100755 --- a/helpers/lh_chroot_debianchroot +++ b/helpers/lh_chroot_debianchroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg new file mode 100755 index 000000000..ae08f8a3c --- /dev/null +++ b/helpers/lh_chroot_dpkg @@ -0,0 +1,88 @@ +#!/bin/sh + +# lh_chroot_dpkg(1) - manage /sbin/dpkg +# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="manage /sbin/dpkg" +HELP="" +USAGE="${PROGRAM} {install|remove} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Read_conffile "${LH_CONFIG}" +Set_defaults + +# Requiring stage file +Require_stagefile .stage/bootstrap + +case "${1}" in + install) + Echo_message "Configuring file /sbin/start-stop-daemon" + + # Checking stage file + Check_stagefile .stage/chroot_dpkg + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Save start-stop-daemon program + mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig + + # Create start-stop-daemon program + +cat > chroot/sbin/start-stop-daemon << EOF +#!/bin/sh + +exit 0 +EOF + + chmod 755 chroot/sbin/start-stop-daemon + + # Creating stage file + Create_stagefile .stage/chroot_dpkg + ;; + + remove) + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + Echo_message "Deconfiguring file /sbin/start-stop-daemon" + + # Restore start-stop-daemon program + mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon + + # Removing stage file + rm -f .stage/chroot_dpkg + ;; + + *) + Usage + ;; +esac diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index a8ee98979..2b571a54c 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing hacks..." diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks index 3e1fc0d7c..0ae95bcc9 100755 --- a/helpers/lh_chroot_hooks +++ b/helpers/lh_chroot_hooks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing hooks..." diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname index 7d04d68df..0106eee73 100755 --- a/helpers/lh_chroot_hostname +++ b/helpers/lh_chroot_hostname @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts index 2cd8f0873..c4d633e35 100755 --- a/helpers/lh_chroot_hosts +++ b/helpers/lh_chroot_hosts @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive index 8c63e2211..236e69b54 100755 --- a/helpers/lh_chroot_interactive +++ b/helpers/lh_chroot_interactive @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_INTERACTIVE}" = "disabled" ] diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image index 44bbfa51f..af93d1d54 100755 --- a/helpers/lh_chroot_linux-image +++ b/helpers/lh_chroot_linux-image @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks index 75702db7a..6197b48a9 100755 --- a/helpers/lh_chroot_local-hooks +++ b/helpers/lh_chroot_local-hooks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing local hooks..." diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes index 329c566e1..5a66a1e57 100755 --- a/helpers/lh_chroot_local-includes +++ b/helpers/lh_chroot_local-includes @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin copying chroot local includes..." diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages index fd4269597..f54686866 100755 --- a/helpers/lh_chroot_local-packages +++ b/helpers/lh_chroot_local-packages @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing local packages..." diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists index dcebd7c7d..bd615e3cd 100755 --- a/helpers/lh_chroot_local-packageslists +++ b/helpers/lh_chroot_local-packageslists @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing local packages lists..." diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed index f93f463c5..bc5bb2e0c 100755 --- a/helpers/lh_chroot_local-preseed +++ b/helpers/lh_chroot_local-preseed @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing locale preseed..." diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization index 25e8d5f65..e24de69c1 100755 --- a/helpers/lh_chroot_localization +++ b/helpers/lh_chroot_localization @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing localization packages..." diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages index 87e8eaf98..661b33543 100755 --- a/helpers/lh_chroot_packages +++ b/helpers/lh_chroot_packages @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing packages..." diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index 2c21574f2..7d0cdefb9 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_packageslists @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing packages lists..." diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed index 55732ef9a..49d5aa162 100755 --- a/helpers/lh_chroot_preseed +++ b/helpers/lh_chroot_preseed @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing preseed..." diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index 66b4c3c32..0dc12ab53 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -33,6 +33,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin mounting /proc..." diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index 04090546a..eeeead226 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 4e46ea9b2..307aebae3 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks index 4fffd146a..fb7155d70 100755 --- a/helpers/lh_chroot_symlinks +++ b/helpers/lh_chroot_symlinks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SYMLINKS}" != "enabled" ] diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index 996262d24..f9d1f413f 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -33,6 +33,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin mounting /sys..." diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc index d77306a9c..a9a436bea 100755 --- a/helpers/lh_chroot_sysv-rc +++ b/helpers/lh_chroot_sysv-rc @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index ffed709de..b4927b61e 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Configuring package sysvinit" diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks index 49f44b6d6..46277d72b 100755 --- a/helpers/lh_chroot_tasks +++ b/helpers/lh_chroot_tasks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing tasks..." diff --git a/helpers/lh_clean b/helpers/lh_clean index c4174154c..4c52ed24d 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults rm -f .lock @@ -53,6 +54,7 @@ case "${1}" in ;; 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 diff --git a/helpers/lh_config b/helpers/lh_config index 60e8530c9..766a8536d 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -487,6 +487,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" # Setting defaults Set_defaults diff --git a/helpers/lh_losetup b/helpers/lh_losetup index 8ef33c946..662b4ad76 100755 --- a/helpers/lh_losetup +++ b/helpers/lh_losetup @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults DEVICE="${1}" diff --git a/helpers/lh_source b/helpers/lh_source index 6e04bb4f8..f9b59fe63 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Enabling network in chroot diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian index b15f0938b..e939e6ca5 100755 --- a/helpers/lh_source_debian +++ b/helpers/lh_source_debian @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live index 00ddd2363..d92fe3a6a 100755 --- a/helpers/lh_source_debian-live +++ b/helpers/lh_source_debian-live @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk index 78242d888..e3877494f 100755 --- a/helpers/lh_source_disk +++ b/helpers/lh_source_disk @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE_IMAGES}" != "iso" ] diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index da1e98e5b..b5687817a 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index 55e0d23ee..bf7f3788b 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_net b/helpers/lh_source_net index c6ef05753..eed33c9c5 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar index 5a4d018fe..2e6ae3827 100755 --- a/helpers/lh_source_tar +++ b/helpers/lh_source_tar @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index cf937864d..ff7839385 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_testroot b/helpers/lh_testroot index 90464ecab..f213f86c1 100755 --- a/helpers/lh_testroot +++ b/helpers/lh_testroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Checking user account |