diff options
73 files changed, 76 insertions, 436 deletions
@@ -6,7 +6,7 @@ all: build test: # Checking for syntax errors - set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \ + set -e; for SCRIPT in functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \ do \ sh -n $$SCRIPT; \ done @@ -14,7 +14,7 @@ test: # Checking for bashisms set -e; if [ -x /usr/bin/checkbashisms ]; \ then \ - checkbashisms functions/* examples/*/*.sh helpers/* hooks/*; \ + checkbashisms functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \ else \ echo "bashism test skipped - you need to install devscripts."; \ fi @@ -29,7 +29,7 @@ install: # Installing shared data mkdir -p $(DESTDIR)/usr/share/live-helper - cp -r data examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper + cp -r data examples functions.sh functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper # Installing documentation mkdir -p $(DESTDIR)/usr/share/doc/live-helper @@ -98,7 +98,7 @@ uninstall: done update: - set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.en.*; \ + set -e; for FILE in functions.sh functions/*.sh examples/cron/*.sh manpages/*.en.*; \ do \ sed -i -e 's/2007\\-11\\-26/2007\\-12\\-03/' \ -e 's/26.11.2007/03.12.2007/' \ diff --git a/helpers/lh b/helpers/lh index a92db48ef..ea591a22d 100755 --- a/helpers/lh +++ b/helpers/lh @@ -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 e6b3ce200..87efafc8c 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 acf1366c0..c386bdea5 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 663df9f64..a8e59a5b9 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 b36ae1cf8..bccc05a17 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 d332938f7..55b720da0 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 09df4f08e..0458168be 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 2846da0a3..588190aad 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 561c1127e..45e4e421a 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 ef5a6c177..74eaa1b51 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 0bf9d9b31..fa40e3d3c 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 8132430b0..fb6e5b9db 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 e390d8a65..afc629c3e 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 146bd24b6..410986486 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 fa3f930c6..79aa30ec3 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 cbabf040d..0b7ee09b6 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 9a4caea41..754033c7d 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 a9e6a838c..c24efc3a7 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 863e88a77..b0bf50f83 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 10047c1f1..8f28793d0 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 1b900e3f2..8f8de33ce 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 bf5733b83..147393edd 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 fe7fae8a0..7afb34320 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 48c7cff33..d0adbe402 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 47c81c0ee..570d2f32d 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 6ab5c526a..81b4a0929 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 2dc3c046a..b1a48a7a2 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 1e757315b..ebb81f1a5 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 707c7f15a..74530da55 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 ea72ef1e9..4bd8dea5a 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 dcda21caa..5687a4171 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 b5af6b1dd..b7f881d6e 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 367c0054e..0af45b543 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 7a635ea5e..1ab88b513 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 ea6cc3c4c..80e47997c 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 ad7a7fdcf..273249ce0 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 64a652655..aa0e875b0 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 fc24a9bbc..fa782567a 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 4c34d7694..e392cca2c 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 d09b039eb..b08cf7eb7 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 308bfc066..3dfa60919 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 91863b50e..fae97aa58 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 376234820..1b0f3589b 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 68d99cce7..e57758e7f 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 48689fca9..958fd980e 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 ba53e2971..1b450fc49 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 92b6fcdb9..f8d632d8b 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 6326233be..dd1f9d5ed 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 17331e4ad..cbf6866f4 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 128748bec..7de9a00da 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 bb23e3534..91e19363d 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 de5360305..70eb76e78 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 cf0d7d9aa..26c19ec15 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 d4abf62b8..9ac06f5de 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 d6836b9a0..3d64714c4 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 4f621c5ce..4f725bff9 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 b0dac23df..e9829cb79 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 f09977fbb..0f9250255 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 acd2624de..7b087a490 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 b0f333636..cbaca94ae 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 f34256eb4..b7c51bf47 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 ef5b5063b..cbe892c37 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 8b5ae24e0..c92241856 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 be1d14a61..70bad78e3 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 b66494513..621c66f31 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 3edfaeb7c..4734e532a 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 97d22bf53..8077af9fa 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 c7cfe733a..4930b53a4 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 45e566812..6d60c2163 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 dca6d9349..f7f4c3646 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 225b16007..64be3c55f 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 21dc0fa10..b4e93d009 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')" |