diff options
Diffstat (limited to 'scripts')
81 files changed, 86 insertions, 86 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 59d475f5b..4c156c572 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -LH_BASE="${LH_BASE:-/usr/share/live-helper}" +LH_BASE="${LH_BASE:-/usr/share/live/build}" # Source global functions for FUNCTION in "${LH_BASE}"/functions/*.sh diff --git a/scripts/build/binary b/scripts/build/binary index 41199dcec..33c2f5cac 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build binary images')" diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums index 8fec89110..5ad6ad024 100755 --- a/scripts/build/binary_checksums +++ b/scripts/build/binary_checksums @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'create binary checksums')" diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot index 88f37732a..1ed51e073 100755 --- a/scripts/build/binary_chroot +++ b/scripts/build/binary_chroot @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy chroot into chroot')" diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index fa7b022a6..a02efde68 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install debian-installer into binary')" diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 612e5fcb0..4e28d9dd2 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install disk information into binary')" diff --git a/scripts/build/binary_encryption b/scripts/build/binary_encryption index 8041986f6..2fd2c062f 100755 --- a/scripts/build/binary_encryption +++ b/scripts/build/binary_encryption @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'encrypts rootfs')" diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub index e2f3a589e..2c441cedc 100755 --- a/scripts/build/binary_grub +++ b/scripts/build/binary_grub @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs grub into binary')" diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2 index c17730c71..b6233013e 100755 --- a/scripts/build/binary_grub2 +++ b/scripts/build/binary_grub2 @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs grub2 into binary')" diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes index d9b82b5b2..e80980eed 100755 --- a/scripts/build/binary_includes +++ b/scripts/build/binary_includes @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy files into binary')" diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 56de7eb5c..a8e45036f 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build iso binary image')" diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index 1915e8fc0..5552d4dde 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install linux-image into binary')" diff --git a/scripts/build/binary_local-hooks b/scripts/build/binary_local-hooks index 070c36fc9..68d86ba4e 100755 --- a/scripts/build/binary_local-hooks +++ b/scripts/build/binary_local-hooks @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'execute local hooks in binary')" diff --git a/scripts/build/binary_local-includes b/scripts/build/binary_local-includes index e23ae8993..aaf0eea68 100755 --- a/scripts/build/binary_local-includes +++ b/scripts/build/binary_local-includes @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy files into binary')" diff --git a/scripts/build/binary_local-packageslists b/scripts/build/binary_local-packageslists index e7c8a507c..b77bfa679 100755 --- a/scripts/build/binary_local-packageslists +++ b/scripts/build/binary_local-packageslists @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install local packages into binary')" diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest index d3e0f8ad3..117481767 100755 --- a/scripts/build/binary_manifest +++ b/scripts/build/binary_manifest @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'create manifest')" diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index c739c3a73..a6a9ab775 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs a memtest into binary')" diff --git a/scripts/build/binary_net b/scripts/build/binary_net index 56464551c..d401f9c60 100755 --- a/scripts/build/binary_net +++ b/scripts/build/binary_net @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build netboot binary image')" diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 58284fdba..a07563e67 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build rootfs image')" diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo index e527c7fc1..b76ef2a62 100755 --- a/scripts/build/binary_silo +++ b/scripts/build/binary_silo @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs silo into binary')" diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index e4293bb91..698da62c1 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs syslinux into binary')" diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar index df3f306f3..5d8106c56 100755 --- a/scripts/build/binary_tar +++ b/scripts/build/binary_tar @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build harddisk binary image')" diff --git a/scripts/build/binary_usb b/scripts/build/binary_usb index 13aa76c81..19a6a7e70 100755 --- a/scripts/build/binary_usb +++ b/scripts/build/binary_usb @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build binary image')" diff --git a/scripts/build/binary_virtual-hdd b/scripts/build/binary_virtual-hdd index ac864b9c9..45238d96b 100755 --- a/scripts/build/binary_virtual-hdd +++ b/scripts/build/binary_virtual-hdd @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build binary image')" diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index 1edbc1a30..82b8cdb05 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy win32-loader into binary')" diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot index cf84e2c75..49bcc2d85 100755 --- a/scripts/build/binary_yaboot +++ b/scripts/build/binary_yaboot @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs yaboot into binary')" diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index 4c4c3b77c..3e267e231 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system')" diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache index 381276a4b..22e34aad7 100755 --- a/scripts/build/bootstrap_cache +++ b/scripts/build/bootstrap_cache @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'cache bootstrap stage')" diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 7925ebd97..bf879c488 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')" diff --git a/scripts/build/bootstrap_copy b/scripts/build/bootstrap_copy index d5e0cc5f7..3940d3f7f 100755 --- a/scripts/build/bootstrap_copy +++ b/scripts/build/bootstrap_copy @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap by copying the host system')" diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 677817bad..45d956f84 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')" diff --git a/scripts/build/build b/scripts/build/build index dcd0cb254..c9abacca8 100755 --- a/scripts/build/build +++ b/scripts/build/build @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Automatically populating config tree if [ -x auto/config ] && [ ! -e .stage/config ] diff --git a/scripts/build/chroot b/scripts/build/chroot index 96dbfe7a5..abb69c6ff 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'customize the Debian system')" diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index c95d6497f..9a97c3719 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')" diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache index 49cc5901d..a815105dc 100755 --- a/scripts/build/chroot_cache +++ b/scripts/build/chroot_cache @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'cache chroot stage')" diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot index ae37953de..df87e2a32 100755 --- a/scripts/build/chroot_debianchroot +++ b/scripts/build/chroot_debianchroot @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/debian_chroot')" diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts index d738d5c56..778c95956 100755 --- a/scripts/build/chroot_devpts +++ b/scripts/build/chroot_devpts @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'mount /dev/pts')" diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg index 69f87a478..7b01c65f2 100755 --- a/scripts/build/chroot_dpkg +++ b/scripts/build/chroot_dpkg @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /sbin/dpkg')" diff --git a/scripts/build/chroot_dpkg_tmpfs b/scripts/build/chroot_dpkg_tmpfs index 8d7e26400..965a699d7 100755 --- a/scripts/build/chroot_dpkg_tmpfs +++ b/scripts/build/chroot_dpkg_tmpfs @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /var/lib/dpkg')" diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks index 5a3f9ae98..e07bea99b 100755 --- a/scripts/build/chroot_hacks +++ b/scripts/build/chroot_hacks @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'execute hacks in chroot')" diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks index f5864d864..f5bce989f 100755 --- a/scripts/build/chroot_hooks +++ b/scripts/build/chroot_hooks @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'execute hooks in chroot')" @@ -42,10 +42,10 @@ HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' | for HOOK in ${HOOKS} do - if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ] + if [ -f ${LH_BASE:-/usr/share/live/build}/hooks/"${HOOK}" ] then # Copying hook - cp ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" chroot/root + cp ${LH_BASE:-/usr/share/live/build}/hooks/"${HOOK}" chroot/root # Making hook executable if [ ! -x chroot/root/"${HOOK}" ] diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname index 6046f65ca..11a3200cf 100755 --- a/scripts/build/chroot_hostname +++ b/scripts/build/chroot_hostname @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /bin/hostname')" diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts index ce418dd61..451c3aa58 100755 --- a/scripts/build/chroot_hosts +++ b/scripts/build/chroot_hosts @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/hosts')" diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages index 3b491ad53..6a6fb1e7e 100755 --- a/scripts/build/chroot_install-packages +++ b/scripts/build/chroot_install-packages @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install queued packages into chroot')" diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive index 360557e0a..df4174936 100755 --- a/scripts/build/chroot_interactive +++ b/scripts/build/chroot_interactive @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'make build interactive')" diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image index 5f197759e..22183ea55 100755 --- a/scripts/build/chroot_linux-image +++ b/scripts/build/chroot_linux-image @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')" diff --git a/scripts/build/chroot_local-hooks b/scripts/build/chroot_local-hooks index 1cca5e4cc..ebaff3104 100755 --- a/scripts/build/chroot_local-hooks +++ b/scripts/build/chroot_local-hooks @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'execute local hooks in chroot')" diff --git a/scripts/build/chroot_local-includes b/scripts/build/chroot_local-includes index 5a4052f6f..d032c9431 100755 --- a/scripts/build/chroot_local-includes +++ b/scripts/build/chroot_local-includes @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy local files into chroot')" diff --git a/scripts/build/chroot_local-packages b/scripts/build/chroot_local-packages index a9d39bd7f..192626f8f 100755 --- a/scripts/build/chroot_local-packages +++ b/scripts/build/chroot_local-packages @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of local packages into chroot')" diff --git a/scripts/build/chroot_local-packageslists b/scripts/build/chroot_local-packageslists index cee46e6d3..faffea2d8 100755 --- a/scripts/build/chroot_local-packageslists +++ b/scripts/build/chroot_local-packageslists @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')" diff --git a/scripts/build/chroot_local-patches b/scripts/build/chroot_local-patches index 6c5e8b492..9dccda6e0 100755 --- a/scripts/build/chroot_local-patches +++ b/scripts/build/chroot_local-patches @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'apply local patches against chroot')" diff --git a/scripts/build/chroot_local-preseed b/scripts/build/chroot_local-preseed index 82eaa17fe..86884ce86 100755 --- a/scripts/build/chroot_local-preseed +++ b/scripts/build/chroot_local-preseed @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'execute local preseed in chroot')" diff --git a/scripts/build/chroot_localization b/scripts/build/chroot_localization index eebfd6d41..8c14b76f1 100755 --- a/scripts/build/chroot_localization +++ b/scripts/build/chroot_localization @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install localization packages into chroot')" diff --git a/scripts/build/chroot_packages b/scripts/build/chroot_packages index b612cf9d2..61683b698 100755 --- a/scripts/build/chroot_packages +++ b/scripts/build/chroot_packages @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of packages into chroot')" diff --git a/scripts/build/chroot_packageslists b/scripts/build/chroot_packageslists index 00699d764..e69f446c2 100755 --- a/scripts/build/chroot_packageslists +++ b/scripts/build/chroot_packageslists @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'queue install of packages lists into chroot')" diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed index 4ec7b2fcd..49be4520e 100755 --- a/scripts/build/chroot_preseed +++ b/scripts/build/chroot_preseed @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'execute preseed in chroot')" @@ -40,7 +40,7 @@ Create_lockfile .lock # Processing preseeds for PRESEED in ${LH_PACKAGES_LISTS} ${LH_TASKS} do - if [ -f ${LH_BASE:-/usr/share/live-helper}/preseed/"${PRESEED}" ] + if [ -f ${LH_BASE:-/usr/share/live/build}/preseed/"${PRESEED}" ] then # Check dependency Check_package chroot/usr/bin/debconf-set-selections debconf diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc index 6992ad684..df7b6f53b 100755 --- a/scripts/build/chroot_proc +++ b/scripts/build/chroot_proc @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'mount /proc')" diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv index d8b553c24..b5a7d328a 100755 --- a/scripts/build/chroot_resolv +++ b/scripts/build/chroot_resolv @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/resolv.conf')" diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 23523d25e..0ec2a7d4b 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'mount /selinux')" diff --git a/scripts/build/chroot_sources b/scripts/build/chroot_sources index f18cb6bfd..c8ed480be 100755 --- a/scripts/build/chroot_sources +++ b/scripts/build/chroot_sources @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')" diff --git a/scripts/build/chroot_symlinks b/scripts/build/chroot_symlinks index c2567806a..703172c44 100755 --- a/scripts/build/chroot_symlinks +++ b/scripts/build/chroot_symlinks @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'convert symlinks')" diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs index 857884168..ef9d2ec30 100755 --- a/scripts/build/chroot_sysfs +++ b/scripts/build/chroot_sysfs @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'mount /sys')" diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc index 2154ff4da..5c844a906 100755 --- a/scripts/build/chroot_sysv-rc +++ b/scripts/build/chroot_sysv-rc @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')" diff --git a/scripts/build/chroot_sysvinit b/scripts/build/chroot_sysvinit index 7178ce97f..e61d42bb8 100755 --- a/scripts/build/chroot_sysvinit +++ b/scripts/build/chroot_sysvinit @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'configure sysvinit')" diff --git a/scripts/build/chroot_tasks b/scripts/build/chroot_tasks index 892954d00..a1626aa1e 100755 --- a/scripts/build/chroot_tasks +++ b/scripts/build/chroot_tasks @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install tasks into chroot')" diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart index c80bf8612..3493cdde1 100755 --- a/scripts/build/chroot_upstart +++ b/scripts/build/chroot_upstart @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'manage /usr/sbin/initctl')" diff --git a/scripts/build/clean b/scripts/build/clean index 13fc18556..76a14cb7e 100755 --- a/scripts/build/clean +++ b/scripts/build/clean @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Read meta config if [ "${1}" != "noauto" ] && [ -x auto/clean ] diff --git a/scripts/build/config b/scripts/build/config index f4fe415cd..4d37f4431 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Read meta config if [ "${1}" != "noauto" ] && [ -x auto/config ] diff --git a/scripts/build/lh b/scripts/build/lh index e55feba78..13419580f 100755 --- a/scripts/build/lh +++ b/scripts/build/lh @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'utility to build Debian Live systems')" @@ -44,9 +44,9 @@ case "${1}" in if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ] then LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}" - elif [ -x /usr/share/live-helper/scripts/build/${COMMAND} ] + elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ] then - LH=1 exec /usr/share/live-helper/scripts/build/"${COMMAND}" "${@}" + LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}" elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] then LH=1 exec "${COMMAND}" "${@}" diff --git a/scripts/build/live-helper b/scripts/build/live-helper index 77d867b89..6e7163a60 100755 --- a/scripts/build/live-helper +++ b/scripts/build/live-helper @@ -22,7 +22,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh if [ -x "$(which man 2>/dev/null)" ] then diff --git a/scripts/build/source b/scripts/build/source index 0d049570b..6a4004b81 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build source images')" diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums index e610c240a..2247c8192 100755 --- a/scripts/build/source_checksums +++ b/scripts/build/source_checksums @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'create source checksums')" diff --git a/scripts/build/source_debian b/scripts/build/source_debian index df7e51ebd..1f578affe 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'debian sources')" diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live index e9bcb2f91..4751ac72b 100755 --- a/scripts/build/source_debian-live +++ b/scripts/build/source_debian-live @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy debian-live config into source')" diff --git a/scripts/build/source_disk b/scripts/build/source_disk index 60aff28cd..75ff0d6bf 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'install disk information into source')" diff --git a/scripts/build/source_iso b/scripts/build/source_iso index 3b32fbe1c..af2976cc7 100755 --- a/scripts/build/source_iso +++ b/scripts/build/source_iso @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build iso source image')" diff --git a/scripts/build/source_net b/scripts/build/source_net index 5cc35c81d..a9e653bae 100755 --- a/scripts/build/source_net +++ b/scripts/build/source_net @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build source net image')" diff --git a/scripts/build/source_tar b/scripts/build/source_tar index 9da705c0f..d21ad9c5c 100755 --- a/scripts/build/source_tar +++ b/scripts/build/source_tar @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build source tarball')" diff --git a/scripts/build/source_usb b/scripts/build/source_usb index 894129a23..ca352fdec 100755 --- a/scripts/build/source_usb +++ b/scripts/build/source_usb @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build source image')" diff --git a/scripts/build/source_virtual-hdd b/scripts/build/source_virtual-hdd index 607ad735a..e42901171 100755 --- a/scripts/build/source_virtual-hdd +++ b/scripts/build/source_virtual-hdd @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'build source image')" diff --git a/scripts/build/testroot b/scripts/build/testroot index a4149c4ae..d79735102 100755 --- a/scripts/build/testroot +++ b/scripts/build/testroot @@ -10,7 +10,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh +. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'ensure that a system is built as root')" |