manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replacing some references to live-helper with live-build in examples.

This commit is contained in:
Daniel Baumann 2010-09-02 14:45:03 +02:00
parent d846bb0dec
commit 9cf3e446bf
22 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/cron/cron.daily
View File

@ -5,18 +5,18 @@ set -e
BUILD="daily" BUILD="daily"
HOST="$(hostname)" HOST="$(hostname)"
# Checking for live-helper availability # Checking for live-build availability
if [ ! -x /usr/bin/lh_config ] if [ ! -x /usr/bin/lb ]
then then
exit 0 exit 0
fi fi
# Checking for live-helper defaults # Checking for live-build defaults
if [ -r /etc/default/live-helper_autobuild ] if [ -r /etc/default/live-build_autobuild ]
then then
. /etc/default/live-helper_autobuild . /etc/default/live-build_autobuild
else else
echo "E: /etc/default/live-helper_autobuild missing." echo "E: /etc/default/live-build_autobuild missing."
exit 1 exit 1
fi fi
@ -36,7 +36,7 @@ else
exit 1 exit 1
fi 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} for ARCHITECTURE in ${ARCHITECTURES}
do do
@ -79,7 +79,7 @@ do
if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ] if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
then 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 mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_* rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
mkdir "${TEMPDIR}"/debian-live/binary mkdir "${TEMPDIR}"/debian-live/binary
@ -152,4 +152,4 @@ done
rm -f "${DESTDIR}"/"${BUILD}"-builds/current rm -f "${DESTDIR}"/"${BUILD}"-builds/current
ln -s ${DATE} "${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

4
examples/cron/default
View File

@ -1,10 +1,10 @@
# Defaults for /etc/cron.daily/live-helper_autobuild # Defaults for /etc/cron.daily/live-build_autobuild
AUTOBUILD="false" AUTOBUILD="false"
DATE="$(date +%Y%m%d)" DATE="$(date +%Y%m%d)"
DESTDIR="/srv/debian-live" DESTDIR="/srv/debian-live"
TEMPDIR="/srv/tmp/live-helper" TEMPDIR="/srv/tmp/live-build"
OPTIONS="--binary-indices false" OPTIONS="--binary-indices false"

22
examples/cron/images.sh
View File

@ -113,7 +113,7 @@ do
do do
if [ -e .stage ] if [ -e .stage ]
then then
lh clean lb clean
fi fi
if [ -e config ] if [ -e config ]
@ -127,7 +127,7 @@ do
Set_defaults Set_defaults
lh config \ lb config \
--apt-recommends ${APT_RECOMMENDS} \ --apt-recommends ${APT_RECOMMENDS} \
--binary-indices ${BINARY_INDICES} \ --binary-indices ${BINARY_INDICES} \
--cache-stages "bootstrap rootfs" \ --cache-stages "bootstrap rootfs" \
@ -142,7 +142,7 @@ do
--packages-lists ${FLAVOUR} \ --packages-lists ${FLAVOUR} \
--tasksel ${TASKSEL} ${KERNEL} --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*.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso
mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.list
@ -150,9 +150,9 @@ do
if [ "${DISTRIBUTION}" = "lenny" ] && [ "${ARCHITECTURE}" != "powerpc" ] if [ "${DISTRIBUTION}" = "lenny" ] && [ "${ARCHITECTURE}" != "powerpc" ]
then then
lh clean --binary lb clean --binary
lh config -binary-images usb-hdd lb config -binary-images usb-hdd
lh binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log lb binary 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.log
mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img mv binary.img debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img
mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.img.list
@ -161,11 +161,11 @@ do
if [ "${ARCHITECTURE}" != "powerpc" ] if [ "${ARCHITECTURE}" != "powerpc" ]
then then
lh clean lb clean
rm -rf cache/stages_rootfs 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-net.tar.gz debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz
mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list mv binary.list debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.tar.gz.list
@ -179,9 +179,9 @@ do
if [ "${SOURCE}" = "true" ] if [ "${SOURCE}" = "true" ]
then 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.tar.gz debian-live-${DISTRIBUTION}-source-${FLAVOUR}.debian.tar.gz
mv source.debian.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.debian.tar.gz.list mv source.debian.list debian-live-${DISTRIBUTION}-source-${FLAVOUR}.debian.tar.gz.list

2
examples/hooks/all_binary_debian-installer-banner.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # in the graphical Debian Installer.
# To enable it, copy or symlink this hook into your config/binary_local-hooks # To enable it, copy or symlink this hook into your config/binary_local-hooks
# directory and add a replacement banner.png at: # directory and add a replacement banner.png at:

14
examples/hooks/all_binary_live-helper.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # the binary image.
# To enable it, copy or symlink this hook into your config/chroot_local-hooks # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
@ -11,14 +11,14 @@ mkdir -p "${DIRECTORY}"
cp -a config "${DIRECTORY}" cp -a config "${DIRECTORY}"
if [ -e live-helper ] if [ -e live-build ]
then then
cp -a live-helper "${DIRECTORY}" cp -a live-build "${DIRECTORY}"
else else
mkdir -p "${DIRECTORY}"/live-helper/bin mkdir -p "${DIRECTORY}"/live-build/bin
cp -a /usr/bin/lh* "${DIRECTORY}"/live-helper/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 fi

2
examples/hooks/all_chroot_hal-automount.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.

2
examples/hooks/all_chroot_kernel-purge.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.

2
examples/hooks/all_chroot_linux-modules.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.

2
examples/hooks/all_chroot_localepurge.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #

2
examples/hooks/all_chroot_losetup-lukshome.sh
View File

@ -36,7 +36,7 @@
# -------------- # --------------
# #
# First build your live system with this hook inside config/chroot_local-hooks/. # 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 # build, you might have to run
# #
# lh_clean # lh_clean

2
examples/hooks/all_chroot_rt2570-modules.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.

4
examples/hooks/all_chroot_sun-java6.sh
View File

@ -1,13 +1,13 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #
# Note: This hook requires packages from the non-free category. Make sure you # Note: This hook requires packages from the non-free category. Make sure you
# enabled it in your configuration. # 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 # ask any questions while installing packages. Suns redistribution terms for
# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
# this apt-get call only. # this apt-get call only.

2
examples/hooks/all_chroot_udev-generators.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # rules.
# To enable it, copy or symlink this hook into your config/chroot_local-hooks # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.

2
examples/hooks/all_chroot_update-initramfs.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #

2
examples/hooks/all_chroot_virtualbox-ose.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.

2
examples/hooks/lenny_chroot_aufs-modules.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #

2
examples/hooks/lenny_chroot_kpdf-nodrm.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # manipulation restriction on "DRM protect" PDF documents.
# #
# To enable it, copy or symlink this hook into your config/chroot_local-hooks # To enable it, copy or symlink this hook into your config/chroot_local-hooks

2
examples/hooks/lenny_chroot_madwifi-modules.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #

2
examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #

2
examples/hooks/lenny_chroot_squashfs-modules.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #

4
examples/hooks/lenny_chroot_sun-java5.sh
View File

@ -1,13 +1,13 @@
#!/bin/sh #!/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 # To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory. # directory.
# #
# Note: This hook requires packages from the non-free category. Make sure you # Note: This hook requires packages from the non-free category. Make sure you
# enabled it in your configuration. # 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 # ask any questions while installing packages. Suns redistribution terms for
# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for # Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
# this apt-get call only. # this apt-get call only.

2
examples/hooks/squeeze_chroot_okular-nodrm.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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. # manipulation restriction on "DRM protect" PDF documents.
# #
# To enable it, copy or symlink this hook into your config/chroot_local-hooks # To enable it, copy or symlink this hook into your config/chroot_local-hooks