[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#942238: installer: update apt sources for security



Control: tags -1 + patch

Holger Wansing <hwansing@mailbox.org> wrote:
> 
> Pavel Kosina <peekaa@email.cz> wrote:
> > Package: installation-guide-amd64
> > Severity: normal
> > 
> > Dear Maintainer,
> > 
> > *** Reporter, please consider answering these questions, where appropriate ***
> > 
> >    * What led up to the situation?
> > In installation of debian 10, testing, there is bad entry to
> > /etc/apt/sources.list - installation procedure reports error when trying
> > contact old security repository (up to 9).
> > 
> > The instalation procedure should use the new one:
> > deb http://security.debian.org testing-security main contrib non-free
> > deb-src http://security.debian.org testing-security main contrib non-free
> 
> Despite being reported against the installation-guide, the reported problem
> is in the installer/the installed system and thus 'apt-setup'. 
> The installation-guide also needs an update though.
> 
> So clone, retitle and assigning to apt-setup.

Also, I created a patch for apt-setup (attached).


Holger


-- 
Holger Wansing <hwansing@mailbox.org>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076
diff --git a/debian/changelog b/debian/changelog
index 82ce863..13249d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt-setup (1:0.154) UNRELEASED; urgency=medium
+
+  * Update apt sources lines for security from <dist>/updates to
+    <dist>-security.
+
+ -- Holger Wansing <hwansing@mailbox.org>  Sat, 12 Oct 2019 21:41:47 +0200
+
 apt-setup (1:0.153) unstable; urgency=medium
 
   * Team upload.
diff --git a/generators/91security b/generators/91security
index e9fa4c9..8ac9827 100755
--- a/generators/91security
+++ b/generators/91security
@@ -29,7 +29,7 @@ for dist in contrib non-free; do
 done
 
 # Don't test mirror if no network selected in netcfg
-echo "deb http://$host/debian-security $codename/updates $dists" >> $file
+echo "deb http://$host/debian-security $codename-security $dists" >> $file
 if db_get netcfg/dhcp_options && \
    [ "$RET" = "Do not configure the network at this time" ]; then
 	CODE=9
@@ -52,6 +52,6 @@ if [ "$RET" = false ]; then
 	deb_src="# deb-src"
 fi
 
-echo "$deb_src http://$host/debian-security $codename/updates $dists" >> $file
+echo "$deb_src http://$host/debian-security $codename-security $dists" >> $file
 
 exit $CODE

Reply to: