diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-01-26 17:07:40 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:40 +0100 |
| commit | 9ce762a50229bebd07600f1c29167db31f8bfb53 (patch) | |
| tree | 638905a7598e0e13177696482b87f756764fcbdf /helpers | |
| parent | 58d6b235f955c9d8b7f8bd7c03360b712840b269 (diff) | |
| download | live-build-9ce762a50229bebd07600f1c29167db31f8bfb53.zip live-build-9ce762a50229bebd07600f1c29167db31f8bfb53.tar.gz | |
Using common function file to source shell includes.
Diffstat (limited to 'helpers')
72 files changed, 72 insertions, 432 deletions
@@ -22,12 +22,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'utility to build Debian Live systems')" diff --git a/helpers/lh_binary b/helpers/lh_binary index e6b3ce2..87efafc 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build binary images')" diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index acf1366..c386bde 100755 --- a/helpers/lh_binary_chroot +++ b/helpers/lh_binary_chroot @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'copy chroot into chroot')" diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 663df9f..a8e59a5 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install debian-installer into binary')" diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index b36ae1c..bccc05a 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install disk information into binary')" diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index d332938..55b720d 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'encrypts rootfs')" diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index 09df4f0..0458168 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'installs grub into binary')" diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index 2846da0..588190a 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'copy files into binary')" diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 561c112..45e4e42 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build iso binary image')" diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index ef5a6c1..74eaa1b 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install linux-image into binary')" diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks index 0bf9d9b..fa40e3d 100755 --- a/helpers/lh_binary_local-hooks +++ b/helpers/lh_binary_local-hooks @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'execute local hooks in binary')" diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes index 8132430..fb6e5b9 100755 --- a/helpers/lh_binary_local-includes +++ b/helpers/lh_binary_local-includes @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'copy files into binary')" diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists index e390d8a..afc629c 100755 --- a/helpers/lh_binary_local-packageslists +++ b/helpers/lh_binary_local-packageslists @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install local packages into binary')" diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest index 146bd24..4109864 100755 --- a/helpers/lh_binary_manifest +++ b/helpers/lh_binary_manifest @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'create manifest')" diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index fa3f930..79aa30e 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'create binary md5sums')" diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index cbabf04..0b7ee09 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'installs a memtest into binary')" diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 9a4caea..754033c 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build netboot binary image')" diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index a9e6a83..c24efc3 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build rootfs image')" diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo index 863e88a..b0bf50f 100755 --- a/helpers/lh_binary_silo +++ b/helpers/lh_binary_silo @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'installs silo into binary')" diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 10047c1..8f28793 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'installs syslinux into binary')" diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar index 1b900e3..8f8de33 100755 --- a/helpers/lh_binary_tar +++ b/helpers/lh_binary_tar @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build harddisk binary image')" diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index bf5733b..147393e 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build binary image')" diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index fe7fae8..7afb343 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'installs yaboot into binary')" diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index 48c7cff..d0adbe4 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system')" diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache index 47c81c0..570d2f3 100755 --- a/helpers/lh_bootstrap_cache +++ b/helpers/lh_bootstrap_cache @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'cache bootstrap stage')" diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 6ab5c52..81b4a09 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')" diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy index 2dc3c04..b1a48a7 100755 --- a/helpers/lh_bootstrap_copy +++ b/helpers/lh_bootstrap_copy @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap by copying the host system')" diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 1e75731..ebb81f1 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')" diff --git a/helpers/lh_build b/helpers/lh_build index 707c7f1..74530da 100755 --- a/helpers/lh_build +++ b/helpers/lh_build @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build a Debian Live system')" diff --git a/helpers/lh_chroot b/helpers/lh_chroot index ea72ef1..4bd8dea 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'customize the Debian system')" diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index dcda21c..5687a41 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')" diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache index b5af6b1..b7f881d 100755 --- a/helpers/lh_chroot_cache +++ b/helpers/lh_chroot_cache @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'cache chroot stage')" diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot index 367c005..0af45b5 100755 --- a/helpers/lh_chroot_debianchroot +++ b/helpers/lh_chroot_debianchroot @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/debian_chroot')" diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts index 7a635ea..1ab88b5 100755 --- a/helpers/lh_chroot_devpts +++ b/helpers/lh_chroot_devpts @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'mount /dev/pts')" diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg index ea6cc3c..80e4799 100755 --- a/helpers/lh_chroot_dpkg +++ b/helpers/lh_chroot_dpkg @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /sbin/dpkg')" diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index ad7a7fd..273249c 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'execute hacks in chroot')" diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks index 64a6526..aa0e875 100755 --- a/helpers/lh_chroot_hooks +++ b/helpers/lh_chroot_hooks @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'execute hooks in chroot')" diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname index fc24a9b..fa78256 100755 --- a/helpers/lh_chroot_hostname +++ b/helpers/lh_chroot_hostname @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /bin/hostname')" diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts index 4c34d76..e392cca 100755 --- a/helpers/lh_chroot_hosts +++ b/helpers/lh_chroot_hosts @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/hosts')" diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages index d09b039..b08cf7e 100755 --- a/helpers/lh_chroot_install-packages +++ b/helpers/lh_chroot_install-packages @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install queued packages into chroot')" diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive index 308bfc0..3dfa609 100755 --- a/helpers/lh_chroot_interactive +++ b/helpers/lh_chroot_interactive @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'make build interactive')" diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image index 91863b5..fae97aa 100755 --- a/helpers/lh_chroot_linux-image +++ b/helpers/lh_chroot_linux-image @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')" diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks index 3762348..1b0f358 100755 --- a/helpers/lh_chroot_local-hooks +++ b/helpers/lh_chroot_local-hooks @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'execute local hooks in chroot')" diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes index 68d99cc..e57758e 100755 --- a/helpers/lh_chroot_local-includes +++ b/helpers/lh_chroot_local-includes @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'copy local files into chroot')" diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages index 48689fc..958fd98 100755 --- a/helpers/lh_chroot_local-packages +++ b/helpers/lh_chroot_local-packages @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of local packages into chroot')" diff --git a/helpers/lh_chroot_local-patches b/helpers/lh_chroot_local-patches index ba53e29..1b450fc 100755 --- a/helpers/lh_chroot_local-patches +++ b/helpers/lh_chroot_local-patches @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'apply local patches against chroot')" diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed index 92b6fcd..f8d632d 100755 --- a/helpers/lh_chroot_local-preseed +++ b/helpers/lh_chroot_local-preseed @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'execute local preseed in chroot')" diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization index 6326233..dd1f9d5 100755 --- a/helpers/lh_chroot_localization +++ b/helpers/lh_chroot_localization @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install localization packages into chroot')" diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages index 17331e4..cbf6866 100755 --- a/helpers/lh_chroot_packages +++ b/helpers/lh_chroot_packages @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of packages into chroot')" diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index 128748b..7de9a00 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_packageslists @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of packages lists into chroot')" diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed index bb23e35..91e1936 100755 --- a/helpers/lh_chroot_preseed +++ b/helpers/lh_chroot_preseed @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'execute preseed in chroot')" diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index de53603..70eb76e 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'mount /proc')" diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index cf0d7d9..26c19ec 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/resolv.conf')" diff --git a/helpers/lh_chroot_selinuxfs b/helpers/lh_chroot_selinuxfs index d4abf62..9ac06f5 100755 --- a/helpers/lh_chroot_selinuxfs +++ b/helpers/lh_chroot_selinuxfs @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'mount /selinux')" diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index d6836b9..3d64714 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')" diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks index 4f621c5..4f725bf 100755 --- a/helpers/lh_chroot_symlinks +++ b/helpers/lh_chroot_symlinks @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'convert symlinks')" diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index b0dac23..e9829cb 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'mount /sys')" diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc index f09977f..0f92502 100755 --- a/helpers/lh_chroot_sysv-rc +++ b/helpers/lh_chroot_sysv-rc @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')" diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index acd2624..7b087a4 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'configure sysvinit')" diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks index b0f3336..cbaca94 100755 --- a/helpers/lh_chroot_tasks +++ b/helpers/lh_chroot_tasks @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install tasks into chroot')" diff --git a/helpers/lh_clean b/helpers/lh_clean index f34256e..b7c51bf 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'clean up system build directories')" diff --git a/helpers/lh_config b/helpers/lh_config index ef5b506..cbe892c 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables SYSTEM_LH_CONFFILE="/etc/default/live-helper" diff --git a/helpers/lh_source b/helpers/lh_source index 8b5ae24..c922418 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build source images')" diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian index be1d14a..70bad78 100755 --- a/helpers/lh_source_debian +++ b/helpers/lh_source_debian @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'debian sources')" diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live index b664945..621c66f 100755 --- a/helpers/lh_source_debian-live +++ b/helpers/lh_source_debian-live @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'copy debian-live config into source')" diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk index 3edfaeb..4734e53 100755 --- a/helpers/lh_source_disk +++ b/helpers/lh_source_disk @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'install disk information into source')" diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index 97d22bf..8077af9 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build iso source image')" diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index c7cfe73..4930b53 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'create source md5sums')" diff --git a/helpers/lh_source_net b/helpers/lh_source_net index 45e5668..6d60c21 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build source net image')" diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar index dca6d93..f7f4c36 100755 --- a/helpers/lh_source_tar +++ b/helpers/lh_source_tar @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build source tarball')" diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index 225b160..64be3c5 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'build source image')" diff --git a/helpers/lh_testroot b/helpers/lh_testroot index 21dc0fa..b4e93d0 100755 --- a/helpers/lh_testroot +++ b/helpers/lh_testroot @@ -10,12 +10,7 @@ set -e # Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done +. "${LH_BASE:-/usr/share/live-helper}"/functions.sh # Setting static variables DESCRIPTION="$(Echo 'ensure that a system is built as root')" |