diff options
| -rwxr-xr-x | cgi/live-build-cgi | 12 | ||||
| -rwxr-xr-x | cgi/live-build-cgi.cron | 22 | ||||
| -rw-r--r-- | cgi/live-build-cgi.default | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/cgi/live-build-cgi b/cgi/live-build-cgi index 3bdbcb455..6fb99073b 100755 --- a/cgi/live-build-cgi +++ b/cgi/live-build-cgi @@ -12,11 +12,11 @@ . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Reading defaults -if [ -r /etc/default/live-build.cgi ] +if [ -r /etc/default/live-build-cgi ] then - . /etc/default/live-build.cgi + . /etc/default/live-build-cgi else - echo "E: /etc/default/live-build.cgi missing" + echo "E: /etc/default/live-build-cgi missing" exit 1 fi @@ -168,7 +168,7 @@ else # Writing build file cat > "${_TEMPDIR}"/"${_BUILD}".build << EOF -# live-build.cgi "${VERSION}" build file +# live-build-cgi "${VERSION}" build file # `date -R` _BUILD="${_BUILD}" @@ -221,8 +221,8 @@ _CUSTOM_BINARY="${_CUSTOM_BINARY}" LB_ARCHIVES="${LB_ARCHIVES}" EOF - echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build.cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live - echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|package_lists ${LB_PACKAGE_LISTS}|tasks ${LB_TASKS}|packages ${LB_PACKAGES}|architectures ${LB_ARCHITECTURES}|mirror_bootstrap_security ${LB_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LB_MIRROR_BOOTSTRAP}|mirror_binary_security ${LB_MIRROR_BINARY_SECURITY}|mirror_binary ${LB_MIRROR_BINARY}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live + echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live + echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|package_lists ${LB_PACKAGE_LISTS}|tasks ${LB_TASKS}|packages ${LB_PACKAGES}|architectures ${LB_ARCHITECTURES}|mirror_bootstrap_security ${LB_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LB_MIRROR_BOOTSTRAP}|mirror_binary_security ${LB_MIRROR_BINARY_SECURITY}|mirror_binary ${LB_MIRROR_BINARY}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|binary_indices ${LB_BINARY_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}" >> /var/log/live fi sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html diff --git a/cgi/live-build-cgi.cron b/cgi/live-build-cgi.cron index d7b65a4ba..6c96da8f9 100755 --- a/cgi/live-build-cgi.cron +++ b/cgi/live-build-cgi.cron @@ -12,11 +12,11 @@ . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Reading defaults -if [ -r /etc/default/live-build.cgi ] +if [ -r /etc/default/live-build-cgi ] then - . /etc/default/live-build.cgi + . /etc/default/live-build-cgi else - echo "E: /etc/default/live-build.cgi missing" + echo "E: /etc/default/live-build-cgi missing" exit 1 fi @@ -35,27 +35,27 @@ then fi # Checking lock file -if [ -f /var/lock/live-build.cgi.lock ] +if [ -f /var/lock/live-build-cgi.lock ] then - echo "E: live-build.cgi already/still running." + echo "E: live-build-cgi already/still running." exit 1 fi # Creating lock trap -trap "test -f /var/lock/live-build.cgi.lock && rm -f /var/lock/live-build.cgi.lock; exit 0" 0 1 2 3 9 15 +trap "test -f /var/lock/live-build-cgi.lock && rm -f /var/lock/live-build-cgi.lock; exit 0" 0 1 2 3 9 15 # Creating lock file -touch /var/lock/live-build.cgi.lock +touch /var/lock/live-build-cgi.lock # Cleanup old builds: cron should be run at least once per hour to take effect if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1 then rm -rf "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* - echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build.cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live + echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live fi -# Ok from here spin through the live-build.cgi files we have waiting to build +# Ok from here spin through the live-build-cgi files we have waiting to build #if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1 if Find_files ${_TEMPDIR}/*.build then @@ -78,7 +78,7 @@ then _CUSTOM_BINARY=`awk -F\" '/^_CUSTOM_BINARY=/{print $2}' ${_FILE}` # Drop out some build data for information if something goes wrong. - echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build.cgi: begin web build (${_BUILD})." >> /var/log/live + echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live # Creating build directory which also creates the config/chroot_sources folder mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources @@ -189,6 +189,6 @@ EOF # Removing build directory rm -rf "${_TEMPDIR}"/"${_BUILD}" - echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build.cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live + echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live done fi diff --git a/cgi/live-build-cgi.default b/cgi/live-build-cgi.default index 37a879b25..dc304a673 100644 --- a/cgi/live-build-cgi.default +++ b/cgi/live-build-cgi.default @@ -1,4 +1,4 @@ -# Defaults for /etc/cron.daily/live-build.cgi +# Defaults for /etc/cron.daily/live-build-cgi _WEBBUILD="disabled" |