--- trunk/mlivecdbuild/profiles/alx-0_7_branch/i686/prepare_custom 2017/08/31 12:55:23 3064 +++ trunk/mlivecdbuild/profiles/alx-0_7_branch/i686/prepare_custom 2017/08/31 13:01:06 3065 @@ -92,11 +92,11 @@ # create tarball [[ -f ${CDISOROOT}/system/alx-i686.tar.bz2 ]] && rm ${CDISOROOT}/system/alx-i686.tar.bz2 - ( cd ${LIVECDROOT}/install-temp; tar cvjpf ${CDISOROOT}/system/alx-i686.tar.bz2 ./ | tee log) + ( cd ${LIVECDROOT}/install-temp; tar cvjpf ${CDISOROOT}/system/alx-i686.tar.bz2 ./ | tee ${LIVECDROOT}/install.log ) # create images.conf echo "CDIMAGENAME=alx-i686.tar.bz2" > ${CDISOROOT}/system/images.conf - echo "TOTALLINES=$(wc -l ${LIVECDROOT}/install-temp/log | cut -d' ' -f1)" >> ${CDISOROOT}/system/images.conf + echo "TOTALLINES=$(wc -l ${LIVECDROOT}/install.log | cut -d' ' -f1)" >> ${CDISOROOT}/system/images.conf create_netboot_image @@ -105,6 +105,10 @@ then rm -rf ${LIVECDROOT}/install-temp fi + if [[ -f ${LIVECDROOT}/install.log ]] + then + rm ${LIVECDROOT}/install.log + fi } ## @@ -279,17 +283,21 @@ # create tarball [[ -f ${CDISOROOT}/server/alx-svr-i686.tar.bz2 ]] && rm ${CDISOROOT}/server/alx-svr-i686.tar.bz2 - ( cd ${LIVECDROOT}/server-temp; tar cvjpf ${CDISOROOT}/server/alx-svr-i686.tar.bz2 ./ | tee log) + ( cd ${LIVECDROOT}/server-temp; tar cvjpf ${CDISOROOT}/server/alx-svr-i686.tar.bz2 ./ | tee ${LIVECDROOT}/server.log ) # create images.conf echo "CDIMAGENAME=alx-svr-i686.tar.bz2" > ${CDISOROOT}/server/images.conf - echo "TOTALLINES=$(wc -l ${LIVECDROOT}/server-temp/log | cut -d' ' -f1)" >> ${CDISOROOT}/server/images.conf + echo "TOTALLINES=$(wc -l ${LIVECDROOT}/server.log | cut -d' ' -f1)" >> ${CDISOROOT}/server/images.conf # clean up if [[ -d ${LIVECDROOT}/server-temp ]] then rm -rf ${LIVECDROOT}/server-temp fi + if [[ -f ${LIVECDROOT}/server.log ]] + then + rm ${LIVECDROOT}/server.log + fi } # set an empty root password