Author: hawk Date: Wed Mar 22 23:47:20 2006 GMT
Module: admin Tag: AC-branch
---- Log message:
- support generating DVD images
---- Files affected:
admin/ftp:
geniso-SRPMS (1.1.2.5 -> 1.1.2.6)
---- Diffs:
================================================================
Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.5 admin/ftp/geniso-SRPMS:1.1.2.6
--- admin/ftp/geniso-SRPMS:1.1.2.5 Wed Mar 22 19:02:28 2006
+++ admin/ftp/geniso-SRPMS Thu Mar 23 00:47:15 2006
@@ -14,7 +14,13 @@
size=0
fileno=1
-iso_size=`expr 1024 \* 1024 \* 650`
+if [ "$1" = "dvd" ]; then
+ iso_size=`expr 1024 \* 1024 \* 4500`
+ MEDIA="DVD"
+else
+ iso_size=`expr 1024 \* 1024 \* 650`
+ MEDIA="CD"
+fi
listd=${ISOTMPDIR}/cd${fileno}.links
calc_size()
@@ -31,7 +37,7 @@
fsize=`expr $s + \( \( $s + 2047 \) % 2048 \)`
size=`expr $size + $fsize`
if [ "$size" -ge "$iso_size" ] ; then
- echo -n " CD${fileno}"
+ echo -n " ${MEDIA}${fileno}"
size=0
fileno=`expr $fileno + 1`
listd=${ISOTMPDIR}/cd${fileno}.links
@@ -48,7 +54,7 @@
for i in ${ISOTMPDIR}/cd*.links ; do
num=`echo $i | sed 's/\/.*\/cd\([0-9]\+\)\.links/\1/'`
- ISONAME="pld-${VERSION}-${SUBVER}-CD${num}.SRPMS"
+ ISONAME="pld-${VERSION}-${SUBVER}-${MEDIA}${num}.SRPMS"
${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso \
-f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso
================================================================
---- CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.5&r2=1.1.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
