--- /tmp/cd-mirror	2005-06-02 13:18:49.000000000 +0200
+++ bin/cd-mirror	2005-06-06 10:51:27.000000000 +0200
@@ -27,14 +27,13 @@
 fi
 trap 'rm -f $LOCK > /dev/null 2>&1; echo -n "Done at " >> $LOGFILE; date >> $LOGFILE; savelog $LOGFILE > /dev/null' EXIT
 
-
 # Deleting the images before the run if DELETEFIRST is set.
 
 if [ $DELETEFIRST ]; then
 	echo "Removing images not on the other host:" >> $LOGFILE
 	let NRSYNCS++
 	rsync -av --delete --ignore-existing --existing --exclude "$EXCLUDE" \
-	$RSYNC_USER@$RSYNC_HOST::${MODULE} ${TO} >>$LOGFILE 2>&1
+	$RSYNC_HOST::${MODULE} ${TO} >>$LOGFILE 2>&1
 	if [ `grep -c '^total size is' $LOGFILE ` -ne $NRSYNCS ]; then
 		( echo  "Eeek. Debian jigdo rsync broke down... Check logs.."; \
 		  egrep '^write failed|@ERROR' $LOGFILE ) | mail -s "Debian-cd sync failed" $ERRORMAIL
@@ -46,12 +45,13 @@
 let NRSYNCS++
 rsync -avH --delete --delete-after \
      --timeout 7200 \
+     --include "*-businesscard.iso" \
      --exclude "Archive-Update-in-Progress-${HOST}" \
      --exclude "project/trace/${HOST}" \
      --exclude "project/trace/cdimage.debian.org" \
      --exclude "$EXCLUDE" \
      --exclude "*.iso" \
-     $RSYNC_USER@$RSYNC_HOST::${MODULE} ${TO} >> $LOGFILE 2>&1
+     $RSYNC_HOST::${MODULE} ${TO} >> $LOGFILE 2>&1
 
 if [ `grep -c '^total size is' $LOGFILE ` -ne $NRSYNCS ]; then
 	( echo  "Eeek. Debian jigdo rsync broke down... Check logs.."; \
@@ -67,7 +67,9 @@
 
 versionDir="${TO}/${currentVersion}"
 
-for a in ${versionDir}/*/; do
+mkdir ${LOGDIR}/jigdo/ > /dev/null 2>&1 /dev/null
+
+for a in ${versionDir}/i386/ ${versionDir}/source/; do
 	arch=`basename $a`
 	sets=`cat ${TO}/project/build/${currentVersion}/${arch}`
 	for s in $sets; do
@@ -81,25 +83,26 @@
 		echo "jigdoDir=$jigdoDir" > $jigdoConf.$arch.$s
 		echo "imageDir=$imageDir" >> $jigdoConf.$arch.$s
 		echo "tmpDir=$tmpDirBase/$arch.$s" >> $jigdoConf.$arch.$s
-		echo "logfile=${LOGDIR}/$arch.$s.log" >> $jigdoConf.$arch.$s
+		echo "logfile=${LOGDIR}/jigdo/$arch.$s.log" >> $jigdoConf.$arch.$s
 		cat ${jigdoConf}.in >> $jigdoConf.$arch.$s
-		echo -n "jigdoing $arch-$s, starting at " >>$LOGFILE
+		echo -n "jigdoing $arch-$s, starting at " >> $LOGFILE
 		date  >> $LOGFILE
-		jigdo-mirror $jigdoConf.$arch.$s >>$LOGFILE
+		jigdo-mirror $jigdoConf.$arch.$s >> $LOGFILE
 	done
 done
-savelog ${LOGDIR}/*.log >> $LOGFILE
+savelog ${LOGDIR}/jigdo/*.log >> $LOGFILE
 
 echo -n "jigdo-mirror done, now doing final rsync. at " >> $LOGFILE
 date >> $LOGFILE
 
 let NRSYNCS++
-rsync -avH -n --delete --delete-after \
+rsync -avH --delete --delete-after \
+     --existing \
      --timeout 7200 --size-only\
      --exclude "Archive-Update-in-Progress-${HOST}" \
      --exclude "project/trace/${HOST}" \
      --exclude "$EXCLUDE" \
-     $RSYNC_USER@$RSYNC_HOST::$MODULE/. $TO/. >> $LOGFILE 2>&1
+     $RSYNC_HOST::$MODULE/. $TO/. >> $LOGFILE 2>&1
 
 if [ `grep -c '^total size is' $LOGFILE ` -ne $NRSYNCS ]; then
 	( echo "Eeek. Debian cdimage rsync broke down... Check logs.."; \