Replacing some references to live-helper with live-build in examples.
This commit is contained in:
Daniel Baumann
parent
d846bb0dec
commit
9cf3e446bf
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue