--- Begin Message ---
Package: apt-setup
Version: 0.49
Tags: patch
Hi,
Starting with the squeeze release, the volatile repository will be
replaced by the $dist-updates suite, which will be carried on the
standard ftp.d.o mirrors instead of residing on volatile.d.o.
As discussed on IRC, please find attached a patch that adds support for
this to apt-setup. This has been tested using the November 29th weekly
d-i ISO with the updated udebs for apt-setup injected in to it (and
generators/90services-select hacked so that volatile was selectable for
an install of testing) and a "standard" (i.e. non-expert mode) install.
Also as discussed, I've not touched the debconf templates whilst
preparing the patch. This does mean that the on-screen text does not
quite match what actually happens, but that's preferable to Christian
hunting me down. :-)
There is an issue with the patch, in that it doesn't handle installs
where no network mirror has been selected; I thought it was better to
have the patch available "as-is" though. Suggestions for how to handle
that case welcome.
Regards,
Adam
diff -Nru apt-setup-0.49/generators/92volatile apt-setup-0.50/generators/92volatile
--- apt-setup-0.49/generators/92volatile 2009-07-23 17:53:14.000000000 +0100
+++ apt-setup-0.50/generators/92volatile 2010-12-02 00:50:03.000000000 +0000
@@ -18,6 +18,15 @@
codename="$RET"
db_get mirror/suite
suite="$RET"
+
+ if [ "$codename" != "lenny" ]; then
+ db_get mirror/protocol
+ protocol="$RET"
+ db_get mirror/$protocol/hostname
+ host="$RET"
+ db_get mirror/$protocol/directory
+ directory="/${RET#/}"
+ fi
else
db_get cdrom/codename
codename="$RET"
@@ -35,7 +44,11 @@
done
# Don't test mirror if no network selected in netcfg
-echo "deb http://$host/debian-volatile $codename/volatile $dists" >> $file
+if [ "$codename" = "lenny" ]; then
+ echo "deb http://$host/debian-volatile $codename/volatile $dists" >> $file
+else
+ echo "deb $protocol://${host}${directory} ${codename}-updates $dists" >> $file
+fi
if db_get netcfg/dhcp_options && \
[ "$RET" = "Do not configure the network at this time" ]; then
CODE=9
@@ -52,6 +65,10 @@
fi
fi
-echo "deb-src http://$host/debian-volatile $codename/volatile $dists" >> $file
+if [ "$codename" = "lenny" ]; then
+ echo "deb-src http://$host/debian-volatile $codename/volatile $dists" >> $file
+else
+ echo "deb-src $protocol://${host}${directory} ${codename}-updates $dists" >> $file
+fi
exit $CODE
--- End Message ---
--- Begin Message ---
Source: apt-setup
Source-Version: 1:0.50
We believe that the bug you reported is fixed in the latest version of
apt-setup, which is due to be installed in the Debian FTP archive:
apt-cdrom-setup_0.50_all.udeb
to main/a/apt-setup/apt-cdrom-setup_0.50_all.udeb
apt-mirror-setup_0.50_all.udeb
to main/a/apt-setup/apt-mirror-setup_0.50_all.udeb
apt-setup-udeb_0.50_all.udeb
to main/a/apt-setup/apt-setup-udeb_0.50_all.udeb
apt-setup_0.50.dsc
to main/a/apt-setup/apt-setup_0.50.dsc
apt-setup_0.50.tar.gz
to main/a/apt-setup/apt-setup_0.50.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 605640@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christian Perrier <bubulle@debian.org> (supplier of updated apt-setup package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Tue, 07 Dec 2010 22:06:38 +0100
Source: apt-setup
Binary: apt-setup-udeb apt-mirror-setup apt-cdrom-setup
Architecture: source all
Version: 1:0.50
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Christian Perrier <bubulle@debian.org>
Description:
apt-cdrom-setup - set up a CD in sources.list (udeb)
apt-mirror-setup - set up a mirror in sources.list (udeb)
apt-setup-udeb - Configure apt (udeb)
Closes: 605640
Changes:
apt-setup (1:0.50) unstable; urgency=low
.
[ Christian Perrier ]
* Move security/volatile question to sublevel 3 in
translation files as this question is not asked in
default installs
.
[ Adam D. Barratt ]
* Support the new suite name for "volatile". Closes: #605640
.
[ Updated translations ]
* Lao (lo.po) by Anousak Souphavanh
* Northern Sami (se.po) by Børre Gaup
* Sinhala (si.po) by Danishka Navin
* Slovenian (sl.po) by Vanja Cvelbar
Checksums-Sha1:
f586d27d52e1fdcafe0f47151a1c2087c14640c8 1518 apt-setup_0.50.dsc
8d3ff9d0d438863e2e66aa94058a7d1237b4527c 254807 apt-setup_0.50.tar.gz
9c128d2098076eb47241b468fcfe99a41d578fac 48554 apt-setup-udeb_0.50_all.udeb
cd3bc8a1da7526c22a80aa1da88a22db120f6e54 67668 apt-mirror-setup_0.50_all.udeb
1766b43ee4fc3511f4c01fe6eeae82b2054fb5f1 87238 apt-cdrom-setup_0.50_all.udeb
Checksums-Sha256:
625a86a36bfdd48b790880096b3cc3d7422828b45f76ce7daeabcd092c4c78f9 1518 apt-setup_0.50.dsc
02785f5cb4ba20dc2cffb6a325af11504cad4b8199ee2678cf2dec06571d43b1 254807 apt-setup_0.50.tar.gz
9b676fec5a0a997d6e2838677a536c179c8010492bd5befd0e1c010cd8f52d8e 48554 apt-setup-udeb_0.50_all.udeb
71e2951337889d6196a596f08f222ba23d3112162dd2332db8b60dc3a182e357 67668 apt-mirror-setup_0.50_all.udeb
a8b8506c25bc3374be0cd4a6934e42853dabf0677952fdf0f3902a4c01559fdf 87238 apt-cdrom-setup_0.50_all.udeb
Files:
6ff3909a72e56c6e291bc0c92c6cf9d5 1518 debian-installer extra apt-setup_0.50.dsc
587861817d19591878ca9285da4ecdf3 254807 debian-installer extra apt-setup_0.50.tar.gz
3ba84a302851c9e11cef34c50ee790d7 48554 debian-installer standard apt-setup-udeb_0.50_all.udeb
a1fa150f5ed1961a3bf842e67880dc97 67668 debian-installer extra apt-mirror-setup_0.50_all.udeb
732fba77196a85906e2f6b1f63433259 87238 debian-installer extra apt-cdrom-setup_0.50_all.udeb
Package-Type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIVAwUBTP6icIcvcCxNbiWoAQJmRQ/9EX2VFE2aI/dBXi0qwlBH3061G7jgJjTZ
PKmawn5YTJlJV8M55UDNO7GGLM2pOt/FlEc9gJlF4Hb77kKyX81rqHHp9F+R684U
tgGe9cF6vzTxCNxHCH65Jwbn3/4QYpCOAICykWVZ62dRn+jT+Gm+GKJ6Bcqmy+hE
w0RR4uLPdMA5fQjT/TuMTBUCtjETMRPUvS+pkNQse6HG5ENpslVJgsOyeqRE4jiH
oIiGIZLLchVQzkiYFDJ7q+iFFU1umOFyIuDdlMFuiDuhke4hKoeqWBTezaqq1vT8
g2FQxOFgYNj3NdyV5ERBTQaGv5UAqi8QLUFlZiyGuNOWj4C92ZmNcLHbUzV42yrh
u5uT+Vk5hYhcWvcJ87vDnSnvLeOa5zdOBYon+iUSQ7yko81qJTzouaR+oPR2GJwn
MA9xrP2+PfVk0mkp2eHSvk+bno57K9nZ+5pQfWgunVLQFQD4M3HCw6Kt6E5Y8v1m
Fg13H6ZvAo8IAslr9IeI69liWs+40A9FxnlA/4FLlsmSHKPRbW6UxvbW1N5gO3uQ
vYmlSwBi/6Owu+rcbwEGwO7AUb6DsxU/jrlqhdAwKvByMPFzO4qhHq6n1VHTYVbJ
7Re3a+EchsuHxORipwnCS5IiV5QU5tHBFggaV4tRQgOYX8AML5YYuqrXTLRo+SG8
/Ctmdnhl1aw=
=SeWF
-----END PGP SIGNATURE-----
--- End Message ---