admin (AC-branch): ftp/geniso-poldek - what a mess... backported s...

[hawk]

Author: hawk                         Date: Sun Mar 12 23:19:26 2006 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- what a mess... backported support for PLD bootdisks

---- Files affected:
admin/ftp:
   geniso-poldek (1.15.2.18 -> 1.15.2.19) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.18 admin/ftp/geniso-poldek:1.15.2.19
--- admin/ftp/geniso-poldek:1.15.2.18	Sun Mar 12 23:50:09 2006
+++ admin/ftp/geniso-poldek	Mon Mar 13 00:19:20 2006
@@ -105,9 +105,8 @@
     UTILS_SIZE=0
     case "${ARCH}" in
 	i?86)
-		UTILS_SIZE_1=$(du -scmD $ROOT/dists/${DIST}/PLD/i386/PLD/dosutils | grep total  | xargs | cut -d" " -f1)
-		UTILS_SIZE_2=$(du -scmD ${ISOCD}/i486 | grep total  | xargs | cut -d" " -f1)
-		UTILS_SIZE=$(($UTILS_SIZE_1 + $UTILS_SIZE_2 + 10))
+		UTILS_SIZE=$(du -scmD $ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,coinst,inst,images} | grep total  | xargs | cut -d" " -f1)
+		UTILS_SIZE=$(($UTILS_SIZE + 10))
 	;;
 	amd64|x86_64)
 		UTILS_SIZE_1=$(du -scmD $ROOT/dists/${DIST}/PLD/i386/PLD/dosutils | grep total  | xargs | cut -d" " -f1)
@@ -148,12 +147,11 @@
     	mkdir -p ${ISODIR}/PLD || exit 1
 	if [ "${NR}" = "1" ]; then
 	    case ${ARCH} in
-		i386)
-			ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils  ${ISODIR}/PLD/dosutils
-		;;
-	    	i586|i686|athlon)
+		i?86|athlon)
+			ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/coinst${ISODIR}/PLD/coinst
+			ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images${ISODIR}/PLD/images
+			ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst${ISODIR}/PLD/inst
 			ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils  ${ISODIR}/PLD/dosutils
-			do_symlink ${ISOCD}/i486 ${ISODIR}/
 		;;
 		amd64|x86_64)
 			ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils  ${ISODIR}/PLD/dosutils
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.18&r2=1.15.2.19&f=u