diff options
Diffstat (limited to 'examples/cron')
| -rwxr-xr-x | examples/cron/cron.daily | 18 | ||||
| -rw-r--r-- | examples/cron/default | 4 | ||||
| -rwxr-xr-x | examples/cron/images.sh | 22 |
3 files changed, 22 insertions, 22 deletions
diff --git a/examples/cron/cron.daily b/examples/cron/cron.daily index ea630f793..561075687 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 051417b1b..1778b5e89 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 13617756f..a6aebd95d 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 |