Author: hawk Date: Wed Mar 22 23:43:24 2006 GMT Module: admin Tag: AC-branch ---- Log message: - changed DVD image name was: pld-dvd-2.0-RC1-CD1.i686.iso will be: pld-2.0-RC1-DVD1.i686.iso
---- Files affected: admin/ftp: geniso-poldek (1.15.2.24 -> 1.15.2.25) ---- Diffs: ================================================================ Index: admin/ftp/geniso-poldek diff -u admin/ftp/geniso-poldek:1.15.2.24 admin/ftp/geniso-poldek:1.15.2.25 --- admin/ftp/geniso-poldek:1.15.2.24 Thu Mar 23 00:34:06 2006 +++ admin/ftp/geniso-poldek Thu Mar 23 00:43:19 2006 @@ -48,11 +48,11 @@ if [ "$1" = "dvd" ]; then ARCHLIST="i686 amd64 ppc" CDROM_SIZE=4500 - DVD="dvd-" + MEDIA="DVD" else ARCHLIST="i386 i586 i686 athlon amd64 ppc" CDROM_SIZE=650 - DVD="" + MEDIA="CD" fi POLDEK_OLD= @@ -139,7 +139,7 @@ for NR in $(seq 1 ${COUNT}); do - echo "Processing CD${NR}" + echo "Processing ${MEDIA}${NR}" ISODIR=$MAINISODIR/$NR ISODIR0=$MAINISODIR/1 mkdir -p ${ISODIR}/PLD || exit 1 @@ -197,14 +197,14 @@ pld_info > ${ISODIR}/PLD-README.txt rel_info > ${ISODIR}/pld-version - echo "CD${NR} ${ARCH}" >> ${ISODIR}/pld-version + echo "${MEDIA}${NR} ${ARCH}" >> ${ISODIR}/pld-version done for NR in $(seq 1 ${COUNT}); do ISODIR=$MAINISODIR/$NR - ISONAME="pld-${DVD}${DIST}-${SUBVER}-CD${NR}.${ARCH}" + ISONAME="pld-${DIST}-${SUBVER}-${MEDIA}${NR}.${ARCH}" if [ "${NR}" = "1" ]; then BOOTOPT="" case "$ARCH" in @@ -236,7 +236,7 @@ echo "Generating ls and md5sum for ${ISONAME}.iso" cd ${ISOTARGET}/iso/${DIST}/${ARCH} /usr/bin/isoinfo -R -l -i ${ISONAME}.iso > ${ISONAME}.ls - md5sum ${ISONAME}.iso >> pld-${DVD}${DIST}-${SUBVER}.${ARCH}.md5 + md5sum ${ISONAME}.iso >> pld-${DIST}-${SUBVER}.${ARCH}.md5 rm -rf ${ISODIR} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.24&r2=1.15.2.25&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit