[SCM] Debian Live build scripts (webfrontent) branch, master, updated. fc227fc32f06ba8e5af8c9ebdcd147f98790b6ea

Richard Nelson unixabg at gmail.com
Thu Oct 2 22:29:33 UTC 2008 

The following commit has been merged in the master branch:
commit fc227fc32f06ba8e5af8c9ebdcd147f98790b6ea
Author: Richard Nelson <unixabg at gmail.com>
Date:   Thu Oct 2 17:24:37 2008 -0500

    Bug fix in netboot server and path.

diff --git a/scripts/cgi b/scripts/cgi
index 6d94d76..87e42b6 100755
--- a/scripts/cgi
+++ b/scripts/cgi
@@ -101,8 +101,8 @@ else
 	LH_ISO_PUBLISHER=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_publisher=[0-9,a-z,A-Z,., ,~,;,:,/,_,/,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_ISO_VOLUME=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_volume=[0-9,a-z,A-Z,., ,~,;,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_MEMTEST=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])memtest=[0-9,a-z,A-Z,.,_,-]+' | cut -f 2 -d '=' | head -n1)
-	LH_NET_PATH=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])net_path=[0-9,a-z,A-Z,.,_,/,-]+' | cut -f 2 -d '=' | head -n1)
-	LH_NET_SERVER=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])net_server=[0-9,a-z,A-Z,.,_,-]+' | cut -f 2 -d '=' | head -n1)
+	LH_NET_ROOT_PATH=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])net_path=[0-9,a-z,A-Z,.,_,/,-]+' | cut -f 2 -d '=' | head -n1)
+	LH_NET_ROOT_SERVER=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])net_server=[0-9,a-z,A-Z,.,_,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_USERNAME=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])username=[0-9,a-z,A-Z,.,-]+' | cut -f 2 -d '=' | head -n1)
 
 	# Advanced source options
@@ -166,8 +166,8 @@ else
 	    -e "s#LH_ISO_PUBLISHER#${LH_ISO_PUBLISHER}#" \
 	    -e "s#LH_ISO_VOLUME#${LH_ISO_VOLUME}#" \
 	    -e "s/LH_MEMTEST/${LH_MEMTEST}/" \
-	    -e "s#LH_NET_PATH#${LH_NET_PATH}#" \
-	    -e "s/LH_NET_SERVER/${LH_NET_SERVER}/" \
+	    -e "s#LH_NET_ROOT_PATH#${LH_NET_ROOT_PATH}#" \
+	    -e "s/LH_NET_ROOT_SERVER/${LH_NET_ROOT_SERVER}/" \
 	    -e "s#SERVER#${_SERVER}#g" \
 	    -e "s/LH_USERNAME/${LH_USERNAME}/" \
 	    -e "s/LH_SOURCE_IMAGES/${LH_SOURCE_IMAGES}/" \
@@ -220,8 +220,8 @@ LH_ISO_PREPARER="${LH_ISO_PREPARER}"
 LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
 LH_ISO_VOLUME="${LH_ISO_VOLUME}"
 LH_MEMTEST="${LH_MEMTEST}"
-LH_NET_PATH="${LH_NET_PATH}"
-LH_NET_SERVER="${LH_NET_SERVER}"
+LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
+LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
 LH_USERNAME="${LH_USERNAME}"
 
 # Advanced source options
@@ -234,7 +234,7 @@ _CUSTOM_BINARY="${_CUSTOM_BINARY}"
 EOF
 
 	echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-webhelper: add web build (${_BUILD})." >> /var/log/live
-	echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-webhelper: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|sections ${LH_SECTIONS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend ${LH_BOOTAPPEND}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|hostname ${LH_HOSTNAME}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_path ${LH_NET_PATH}|net_server ${LH_NET_SERV
 ER}|username ${LH_USERNAME}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
+	echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-webhelper: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|sections ${LH_SECTIONS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend ${LH_BOOTAPPEND}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|hostname ${LH_HOSTNAME}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_path ${LH_NET_ROOT_PATH}|net_server ${LH_NET
 _ROOT_SERVER}|username ${LH_USERNAME}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
 fi
 
 sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
diff --git a/scripts/cron b/scripts/cron
index 46ad008..088077b 100755
--- a/scripts/cron
+++ b/scripts/cron
@@ -117,13 +117,15 @@ then
 		"${_TEMPLATES}"/mail.txt > "${_DESTDIR}"/"${_BUILD}"/mail
 
 		# Moving binary image
-		if ls "${_TEMPDIR}"/"${_BUILD}"/binary.* > /dev/null 2>&1
+		if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
+		#if Find_files "${_TEMPDIR}/${_BUILD}/binary.*"
 		then
-			mv "${_TEMPDIR}"/"${_BUILD}"/binary.* "${_DESTDIR}"/"${_BUILD}"
+			mv "${_TEMPDIR}"/"${_BUILD}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
 		fi
 
 		# Moving source image
 		if ls "${_TEMPDIR}"/"${_BUILD}"/source.* > /dev/null 2>&1
+		#if Find_files "${_TEMPDIR}/${_BUILD}/source.*"
 		then
 			mv "${_TEMPDIR}"/"${_BUILD}"/source.* "${_DESTDIR}"/"${_BUILD}"
 		fi
@@ -144,6 +146,7 @@ then
 
 		# Unmounting devpts-live
 		if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1
+		#if Find_files "${_TEMPDIR}/${_BUILD}/chroot/dev/pts/*"
 		then
 			umount "${_TEMPDIR}"/${_BUILD}/chroot/dev/pts
 		fi
diff --git a/templates/debian-official/build.html b/templates/debian-official/build.html
index 5bc0608..f03df68 100644
--- a/templates/debian-official/build.html
+++ b/templates/debian-official/build.html
@@ -59,8 +59,8 @@
 	<tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr>
 	<tr><td>--iso-volume: </td><td>LH_ISO_VOLUME</td></tr>
 	<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LH_NET_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LH_NET_SERVER</td></tr>
+	<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
+	<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
 	<tr><td>--username: </td><td>username</td></tr>
 </table>
 
diff --git a/templates/debian-unofficial/build.html b/templates/debian-unofficial/build.html
index 67a735e..19bc255 100644
--- a/templates/debian-unofficial/build.html
+++ b/templates/debian-unofficial/build.html
@@ -59,8 +59,8 @@
 	<tr><td>--iso-publisher: </td><td>LH_ISO_PUBLISHER</td></tr>
 	<tr><td>--iso-volume: </td><td>LH_ISO_VOLUME</td></tr>
 	<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LH_NET_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LH_NET_SERVER</td></tr>
+	<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
+	<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
 	<tr><td>--username: </td><td>username</td></tr>
 </table>
 

-- 
Debian Live build scripts (webfrontent)

More information about the debian-live-changes mailing list