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

diff --git a/my-debmirror b/my-debmirror
index 1e2e5ae..fd11f52 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,8 +1,23 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 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
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --nosource --section=main -d unstable/non-US --getcontents "$@"
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+	  --dist=lenny,squeeze,sid \
+	  --section=main,contrib,non-free,main/debian-installer \
+	  --arch=i386 --getcontents \
+	  --ignore=^README --ignore=^doc/ \
+	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
+ln -nsf lenny /mirror/debian/dists/stable
+ln -nsf squeeze /mirror/debian/dists/testing
+ln -nsf sid /mirror/debian/dists/unstable
+rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
+for dir in doc indices tools; do
+	rsync -aqz --delete "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
+done
+for dist in lenny squeeze sid; do
+	for arch in i386; do
+		rsync -aqz --delete \
+			"$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+			"/mirror/debian/dists/$dist/main/installer-$arch/"
+	done
+done