diff options
author | Daniel Baumann <daniel@debian.org> | 2010-08-14 20:29:05 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:17 +0100 |
commit | c210b8ae444e088957461c9fb242ace1fa63e7b1 (patch) | |
tree | c34ae564f0b86b77ef6023f44be6e9f2c95001a6 /scripts | |
parent | e87d1e3b6ef230db9b2a651eef067c7269253098 (diff) | |
download | live-build-c210b8ae444e088957461c9fb242ace1fa63e7b1.zip live-build-c210b8ae444e088957461c9fb242ace1fa63e7b1.tar.gz |
Moving /usr/share/live-helper to /usr/share/live/build.
Diffstat (limited to 'scripts')
81 files changed, 86 insertions, 86 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 59d475f..4c156c5 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 41199dc..33c2f5c 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 8fec891..5ad6ad0 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 88f3773..1ed51e0 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 fa7b022..a02efde 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 612e5fc..4e28d9d 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 8041986..2fd2c06 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 e2f3a58..2c441ce 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 c17730c..b623301 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 d9b82b5..e80980e 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 56de7eb..a8e4503 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 1915e8f..5552d4d 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 070c36f..68d86ba 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 e23ae89..aaf0eea 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 e7c8a50..b77bfa6 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 d3e0f8a..1174817 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 c739c3a..a6a9ab7 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 5646455..d401f9c 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 58284fd..a07563e 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 e527c7f..b76ef2a 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 e4293bb..698da62 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 df3f306..5d8106c 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 13aa76c..19a6a7e 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 ac864b9..45238d9 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 1edbc1a..82b8cdb 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 cf84e2c..49bcc2d 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 4c4c3b7..3e267e2 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 381276a..22e34aa 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 7925ebd..bf879c4 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 d5e0cc5..3940d3f 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 677817b..45d956f 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 dcd0cb2..c9abacc 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 96dbfe7..abb69c6 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 c95d649..9a97c37 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 49cc590..a815105 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 ae37953..df87e2a 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 d738d5c..778c959 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 69f87a4..7b01c65 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 8d7e264..965a699 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 5a3f9ae..e07bea9 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 f5864d8..f5bce98 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 6046f65..11a3200 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 ce418dd..451c3aa 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 3b491ad..6a6fb1e 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 360557e..df41749 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 5f19775..22183ea 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 1cca5e4..ebaff31 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 5a4052f..d032c94 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 a9d39bd..192626f 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 cee46e6..faffea2 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 6c5e8b4..9dccda6 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 82eaa17..86884ce 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 eebfd6d..8c14b76 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 b612cf9..61683b6 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 00699d7..e69f446 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 4ec7b2f..49be452 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 6992ad6..df7b6f5 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 d8b553c..b5a7d32 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 23523d2..0ec2a7d 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 f18cb6b..c8ed480 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 c256780..703172c 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 8578841..ef9d2ec 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 2154ff4..5c844a9 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 7178ce9..e61d42b 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 892954d..a1626aa 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 c80bf86..3493cdd 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 13fc185..76a14cb 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 f4fe415..4d37f44 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 e55feba..1341958 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 77d867b..6e7163a 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 0d04957..6a4004b 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 e610c24..2247c81 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 df7e51e..1f578af 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 e9bcb2f..4751ac7 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 60aff28..75ff0d6 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 3b32fbe..af2976c 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 5cc35c8..a9e653b 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 9da705c..d21ad9c 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 894129a..ca352fd 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 607ad73..e429011 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 a4149c4..d797351 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')" |