Adding live-helper 1.0~a15-1.

5 files changed, 10 insertions, 10 deletions

diff --git a/examples/cron/daily.sh b/examples/cron/daily.sh
index 30c136502..65150b5f1 100755
--- a/examples/cron/daily.sh
+++ b/examples/cron/daily.sh
@@ -82,7 +82,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh
index 20445cd87..b994e3b7d 100755
--- a/examples/cron/etch+beryl.sh
+++ b/examples/cron/etch+beryl.sh
@@ -7,7 +7,7 @@ BUILD="etch+beryl"
 # Begin custom defaults
 AUTOBUILD="enabled"
 
-DATE="r0_1.0~a14-1"
+DATE="r0_1.0~a15-1"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
 TEMPDIR="/srv/tmp/live-helper"
 
@@ -91,7 +91,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index 4b9c26d79..19d076eb0 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -7,7 +7,7 @@ BUILD="etch"
 # Begin custom defaults
 AUTOBUILD="enabled"
 
-DATE="r0_1.0~a14-1"
+DATE="r0_1.0~a15-1"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
 TEMPDIR="/srv/tmp/live-helper"
 
@@ -82,7 +82,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
diff --git a/examples/cron/weekly.sh b/examples/cron/weekly.sh
index 54aa092d7..6f4003ecf 100755
--- a/examples/cron/weekly.sh
+++ b/examples/cron/weekly.sh
@@ -11,7 +11,7 @@ DATE="`date +%Y%m%d`"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
 TEMPDIR="/srv/tmp/live-helper"
 
-OPTIONS="--binary-indices disabled --initramfs casper"
+OPTIONS="--binary-indices disabled --initramfs live-initramfs"
 
 ARCHITECTURES="`dpkg --print-architecture`"
 DISTRIBUTIONS="lenny"
@@ -82,7 +82,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
@@ -96,10 +96,10 @@ 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
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				mv "${TEMPDIR}"/debian-live/binary/live "${TEMPDIR}"/debian-live/live.tmp
 				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
 				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				mv "${TEMPDIR}"/debian-live/live.tmp "${TEMPDIR}"/debian-live/binary/live
 				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
 				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
 
diff --git a/examples/sources/fai b/examples/sources/fai
index 7d2d7ecf6..762702d67 100644
--- a/examples/sources/fai
+++ b/examples/sources/fai
@@ -4,6 +4,6 @@
 ## To enable it, copy this file to your config/chroot_sources directory, once
 ## as e.g. fai.bootstrap and once as fai.binary.
 
-# FAI - Fully Automated Install
+# FAI - Fully Automatic Installation
 deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln
 deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln