From f96497842018f2eca17715318d6b7cfbb69f50e8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 2 Sep 2010 14:45:03 +0200 Subject: Replacing some references to live-helper with live-build in examples. --- examples/cron/cron.daily | 18 +++++++++--------- examples/cron/default | 4 ++-- examples/cron/images.sh | 22 +++++++++++----------- .../hooks/all_binary_debian-installer-banner.sh | 2 +- examples/hooks/all_binary_live-helper.sh | 14 +++++++------- examples/hooks/all_chroot_hal-automount.sh | 2 +- examples/hooks/all_chroot_kernel-purge.sh | 2 +- examples/hooks/all_chroot_linux-modules.sh | 2 +- examples/hooks/all_chroot_localepurge.sh | 2 +- examples/hooks/all_chroot_losetup-lukshome.sh | 2 +- examples/hooks/all_chroot_rt2570-modules.sh | 2 +- examples/hooks/all_chroot_sun-java6.sh | 4 ++-- examples/hooks/all_chroot_udev-generators.sh | 2 +- examples/hooks/all_chroot_update-initramfs.sh | 2 +- examples/hooks/all_chroot_virtualbox-ose.sh | 2 +- examples/hooks/lenny_chroot_aufs-modules.sh | 2 +- examples/hooks/lenny_chroot_kpdf-nodrm.sh | 2 +- examples/hooks/lenny_chroot_madwifi-modules.sh | 2 +- .../hooks/lenny_chroot_nvidia-legacy-modules.sh | 2 +- examples/hooks/lenny_chroot_squashfs-modules.sh | 2 +- examples/hooks/lenny_chroot_sun-java5.sh | 4 ++-- examples/hooks/squeeze_chroot_okular-nodrm.sh | 2 +- 22 files changed, 49 insertions(+), 49 deletions(-) diff --git a/examples/cron/cron.daily b/examples/cron/cron.daily index ea630f7..5610756 100755 --- a/examples/cron/cron.daily +++ b/examples/cron/cron.daily @@ -5,18 +5,18 @@ set -e BUILD="daily" HOST="$(hostname)" -# Checking for live-helper availability -if [ ! -x /usr/bin/lh_config ] +# Checking for live-build availability +if [ ! -x /usr/bin/lb ] then exit 0 fi -# Checking for live-helper defaults -if [ -r /etc/default/live-helper_autobuild ] +# Checking for live-build defaults +if [ -r /etc/default/live-build_autobuild ] then - . /etc/default/live-helper_autobuild + . /etc/default/live-build_autobuild else - echo "E: /etc/default/live-helper_autobuild missing." + echo "E: /etc/default/live-build_autobuild missing." exit 1 fi @@ -36,7 +36,7 @@ else exit 1 fi -echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-helper: begin daily build." >> /var/log/live +echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-build: begin daily build." >> /var/log/live for ARCHITECTURE in ${ARCHITECTURES} do @@ -79,7 +79,7 @@ do if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] then - # Workaround of missing multi-binary support in live-helper + # Workaround of missing multi-binary support in live-build mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* mkdir "${TEMPDIR}"/debian-live/binary @@ -152,4 +152,4 @@ done rm -f "${DESTDIR}"/"${BUILD}"-builds/current ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current -echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-helper: end daily build." >> /var/log/live +echo "$(date +%b\ %d\ %H:%M:%S) ${HOST} live-build: end daily build." >> /var/log/live diff --git a/examples/cron/default b/examples/cron/default index 051417b..1778b5e 100644 --- a/examples/cron/default +++ b/examples/cron/default @@ -1,10 +1,10 @@ -# Defaults for /etc/cron.daily/live-helper_autobuild +# Defaults for /etc/cron.daily/live-build_autobuild AUTOBUILD="false" DATE="$(date +%Y%m%d)" DESTDIR="/srv/debian-live" -TEMPDIR="/srv/tmp/live-helper" +TEMPDIR="/srv/tmp/live-build" OPTIONS="--binary-indices false" diff --git a/examples/cron/images.sh b/examples/cron/images.sh index 1361775..a6aebd9 100755 --- a/examples/cron/images.sh +++ b/examples/cron/images.sh @@ -113,7 +113,7 @@ do do if [ -e .stage ] then - lh clean + lb clean fi if [ -e config ] @@ -127,7 +127,7 @@ do Set_defaults - lh config \ + lb config \ --apt-recommends ${APT_RECOMMENDS} \ --binary-indices ${BINARY_INDICES} \ --cache-stages "bootstrap rootfs" \ @@ -142,7 +142,7 @@ do --packages-lists ${FLAVOUR} \ --tasksel ${TASKSEL} ${KERNEL} - lh build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log + lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log mv binary*.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list @@ -150,9 +150,9 @@ do if [ "${DISTRIBUTION}" = "lenny" ] && [ "${ARCHITECTURE}" != "powerpc" ] then - lh clean --binary - lh config -binary-images usb-hdd - lh binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log + lb clean --binary + lb config -binary-images usb-hdd + lb binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list @@ -161,11 +161,11 @@ do if [ "${ARCHITECTURE}" != "powerpc" ] then - lh clean + lb clean rm -rf cache/stages_rootfs - lh config --binary-images net + lb config --binary-images net - lh build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.log + lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.log mv binary-net.tar.gz debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list @@ -179,9 +179,9 @@ do if [ "${SOURCE}" = "true" ] then - lh config --source true + lb config --source true - lh source 2>&1 | tee debian-live-${DISTRIBUTION}-source-${FLAVOUR}.log + lb source 2>&1 | tee debian-live-${DISTRIBUTION}-source-${FLAVOUR}.log mv source.debian.tar.gz debian-live-${DISTRIBUTION}-source-${FLAVOUR}.debian.tar.gz mv source.debian.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.debian.tar.gz.list diff --git a/examples/hooks/all_binary_debian-installer-banner.sh b/examples/hooks/all_binary_debian-installer-banner.sh index 7be8682..76c5d07 100755 --- a/examples/hooks/all_binary_debian-installer-banner.sh +++ b/examples/hooks/all_binary_debian-installer-banner.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is an binary hook for live-helper(7) to overwrite the banner +# This is an binary hook for live-build(7) to overwrite the banner # in the graphical Debian Installer. # To enable it, copy or symlink this hook into your config/binary_local-hooks # directory and add a replacement banner.png at: diff --git a/examples/hooks/all_binary_live-helper.sh b/examples/hooks/all_binary_live-helper.sh index 219193b..b60f4a3 100755 --- a/examples/hooks/all_binary_live-helper.sh +++ b/examples/hooks/all_binary_live-helper.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install live-helper and its config into +# This is a hook for live-build(7) to install live-build and its config into # the binary image. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. @@ -11,14 +11,14 @@ mkdir -p "${DIRECTORY}" cp -a config "${DIRECTORY}" -if [ -e live-helper ] +if [ -e live-build ] then - cp -a live-helper "${DIRECTORY}" + cp -a live-build "${DIRECTORY}" else - mkdir -p "${DIRECTORY}"/live-helper/bin - cp -a /usr/bin/lh* "${DIRECTORY}"/live-helper/bin + mkdir -p "${DIRECTORY}"/live-build/bin + cp -a /usr/bin/lh* "${DIRECTORY}"/live-build/bin - cp -a /usr/share/live/build "${DIRECTORY}"/live-helper/share + cp -a /usr/share/live/build "${DIRECTORY}"/live-build/share - cp -a /usr/share/doc/live-build "${DIRECTORY}"/live-helper/doc + cp -a /usr/share/doc/live-build "${DIRECTORY}"/live-build/doc fi diff --git a/examples/hooks/all_chroot_hal-automount.sh b/examples/hooks/all_chroot_hal-automount.sh index 0fec6f9..2a66fe9 100755 --- a/examples/hooks/all_chroot_hal-automount.sh +++ b/examples/hooks/all_chroot_hal-automount.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to enable automaunting with hal for block devices. +# This is a hook for live-build(7) to enable automaunting with hal for block devices. # # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. diff --git a/examples/hooks/all_chroot_kernel-purge.sh b/examples/hooks/all_chroot_kernel-purge.sh index 188f6a4..6d8204e 100755 --- a/examples/hooks/all_chroot_kernel-purge.sh +++ b/examples/hooks/all_chroot_kernel-purge.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to remove any kernel except the newest one. +# This is a hook for live-build(7) to remove any kernel except the newest one. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. diff --git a/examples/hooks/all_chroot_linux-modules.sh b/examples/hooks/all_chroot_linux-modules.sh index 159e9bc..8b07294 100755 --- a/examples/hooks/all_chroot_linux-modules.sh +++ b/examples/hooks/all_chroot_linux-modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to add entries to /etc/modules. +# This is a hook for live-build(7) to add entries to /etc/modules. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. diff --git a/examples/hooks/all_chroot_localepurge.sh b/examples/hooks/all_chroot_localepurge.sh index 3fbb4c4..d820330 100755 --- a/examples/hooks/all_chroot_localepurge.sh +++ b/examples/hooks/all_chroot_localepurge.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install localepurge. +# This is a hook for live-build(7) to install localepurge. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # diff --git a/examples/hooks/all_chroot_losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh index 03efd65..95d3c05 100755 --- a/examples/hooks/all_chroot_losetup-lukshome.sh +++ b/examples/hooks/all_chroot_losetup-lukshome.sh @@ -36,7 +36,7 @@ # -------------- # # First build your live system with this hook inside config/chroot_local-hooks/. -# If you have an existing live-helper build directory with a previous live +# If you have an existing live-build build directory with a previous live # build, you might have to run # # lh_clean diff --git a/examples/hooks/all_chroot_rt2570-modules.sh b/examples/hooks/all_chroot_rt2570-modules.sh index 408b138..b8ffdad 100755 --- a/examples/hooks/all_chroot_rt2570-modules.sh +++ b/examples/hooks/all_chroot_rt2570-modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install ralink rt2570 drivers +# This is a hook for live-build(7) to install ralink rt2570 drivers # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. diff --git a/examples/hooks/all_chroot_sun-java6.sh b/examples/hooks/all_chroot_sun-java6.sh index 5a75962..4faff16 100755 --- a/examples/hooks/all_chroot_sun-java6.sh +++ b/examples/hooks/all_chroot_sun-java6.sh @@ -1,13 +1,13 @@ #!/bin/sh -# This is a hook for live-helper(7) to install sun-java. +# This is a hook for live-build(7) to install sun-java. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # # Note: This hook requires packages from the non-free category. Make sure you # enabled it in your configuration. -# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not +# live-build sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not # ask any questions while installing packages. Suns redistribution terms for # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for # this apt-get call only. diff --git a/examples/hooks/all_chroot_udev-generators.sh b/examples/hooks/all_chroot_udev-generators.sh index 2431e3d..9a5fed2 100755 --- a/examples/hooks/all_chroot_udev-generators.sh +++ b/examples/hooks/all_chroot_udev-generators.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to remove udev persistent device generator +# This is a hook for live-build(7) to remove udev persistent device generator # rules. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. diff --git a/examples/hooks/all_chroot_update-initramfs.sh b/examples/hooks/all_chroot_update-initramfs.sh index 5179f77..b75b135 100755 --- a/examples/hooks/all_chroot_update-initramfs.sh +++ b/examples/hooks/all_chroot_update-initramfs.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to rebuild the initramfs image. +# This is a hook for live-build(7) to rebuild the initramfs image. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # diff --git a/examples/hooks/all_chroot_virtualbox-ose.sh b/examples/hooks/all_chroot_virtualbox-ose.sh index bcf7289..e1dab4a 100755 --- a/examples/hooks/all_chroot_virtualbox-ose.sh +++ b/examples/hooks/all_chroot_virtualbox-ose.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to enable virtualbox-ose module. +# This is a hook for live-build(7) to enable virtualbox-ose module. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. diff --git a/examples/hooks/lenny_chroot_aufs-modules.sh b/examples/hooks/lenny_chroot_aufs-modules.sh index e70dcc7..2d0d16e 100755 --- a/examples/hooks/lenny_chroot_aufs-modules.sh +++ b/examples/hooks/lenny_chroot_aufs-modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install aufs drivers +# This is a hook for live-build(7) to install aufs drivers # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # diff --git a/examples/hooks/lenny_chroot_kpdf-nodrm.sh b/examples/hooks/lenny_chroot_kpdf-nodrm.sh index bbc46b9..20a4f9f 100755 --- a/examples/hooks/lenny_chroot_kpdf-nodrm.sh +++ b/examples/hooks/lenny_chroot_kpdf-nodrm.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to configure KDE's PDF viewer to ignore +# This is a hook for live-build(7) to configure KDE's PDF viewer to ignore # manipulation restriction on "DRM protect" PDF documents. # # To enable it, copy or symlink this hook into your config/chroot_local-hooks diff --git a/examples/hooks/lenny_chroot_madwifi-modules.sh b/examples/hooks/lenny_chroot_madwifi-modules.sh index 0686c12..336e84c 100755 --- a/examples/hooks/lenny_chroot_madwifi-modules.sh +++ b/examples/hooks/lenny_chroot_madwifi-modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install madwifi drivers +# This is a hook for live-build(7) to install madwifi drivers # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # diff --git a/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh b/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh index 66d67bc..7374ce4 100755 --- a/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh +++ b/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install nvidia-kernel-legacy drivers +# This is a hook for live-build(7) to install nvidia-kernel-legacy drivers # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # diff --git a/examples/hooks/lenny_chroot_squashfs-modules.sh b/examples/hooks/lenny_chroot_squashfs-modules.sh index 20667e2..cfa2f77 100755 --- a/examples/hooks/lenny_chroot_squashfs-modules.sh +++ b/examples/hooks/lenny_chroot_squashfs-modules.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to install squashfs drivers +# This is a hook for live-build(7) to install squashfs drivers # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # diff --git a/examples/hooks/lenny_chroot_sun-java5.sh b/examples/hooks/lenny_chroot_sun-java5.sh index 139efd5..27034a7 100755 --- a/examples/hooks/lenny_chroot_sun-java5.sh +++ b/examples/hooks/lenny_chroot_sun-java5.sh @@ -1,13 +1,13 @@ #!/bin/sh -# This is a hook for live-helper(7) to install sun-java. +# This is a hook for live-build(7) to install sun-java. # To enable it, copy or symlink this hook into your config/chroot_local-hooks # directory. # # Note: This hook requires packages from the non-free category. Make sure you # enabled it in your configuration. -# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not +# live-build sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not # ask any questions while installing packages. Suns redistribution terms for # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for # this apt-get call only. diff --git a/examples/hooks/squeeze_chroot_okular-nodrm.sh b/examples/hooks/squeeze_chroot_okular-nodrm.sh index 782133c..96ce094 100755 --- a/examples/hooks/squeeze_chroot_okular-nodrm.sh +++ b/examples/hooks/squeeze_chroot_okular-nodrm.sh @@ -1,6 +1,6 @@ #!/bin/sh -# This is a hook for live-helper(7) to configure KDE's PDF viewer to ignore +# This is a hook for live-build(7) to configure KDE's PDF viewer to ignore # manipulation restriction on "DRM protect" PDF documents. # # To enable it, copy or symlink this hook into your config/chroot_local-hooks -- cgit v1.0