X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=blobdiff_plain;f=my-debmirror;h=75ad1214522d8cadc346f9bf8944e6d86e63a5c4;hb=1f0b1ec620a9b636d7ff6fbd98ae27e078a32512;hp=1e2e5ae7634a9399c0afc5fa6769b9b0999d7355;hpb=860fe69bcdea28f2ccc9f58cc73073b6f10d5671;p=bin.git

diff --git a/my-debmirror b/my-debmirror
index 1e2e5ae..75ad121 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,8 +1,24 @@
-#! /bin/sh -e
+#! /bin/sh
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
 debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --nosource --section=main,main/debian-installer --getcontents \
-	  --ignore=non-US/ "$@" 2>&1 >/dev/null | \
-	  grep -v 'debian-installer.*Release' 1>&2
+	  --dist=testing,unstable \
+	  --section=main,contrib,non-free,main/debian-installer \
+	  --arch=i386,powerpc --getcontents \
+	  --ignore=non-US/,doc/,indices/,tools/,main/installer- "$@"
 debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --nosource --section=main -d unstable/non-US --getcontents "$@"
+	  --dist=testing/non-US,unstable/non-US \
+	  --arch=i386,powerpc --getcontents "$@"
+ln -sf testing /mirror/debian/dists/sarge
+ln -sf unstable /mirror/debian/dists/sid
+ln -sf testing /mirror/debian/non-US/dists/sarge
+ln -sf unstable /mirror/debian/non-US/dists/sid
+rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
+for dir in doc indices tools; do
+	rsync -aqz "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
+done
+for dist in testing unstable; do
+	for arch in i386 powerpc; do
+		rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+			"/mirror/debian/dists/$dist/main/installer-$arch/"
+	done
+done