Control: tags -1 patch On Sat, 03 Jun 2017 11:55:37 +0200 Niels Thykier <ni...@thykier.net> wrote: > Package: release-notes > Severity: minor > > Justin Rye (#863975): > > Incidentally, the release-notes mention /etc/apt/sources.list plenty > > of times but never /etc/apt/sources.list.d/*.list files; and soon > > we'll also have the option of deb822-style .sources files - see the > > sources.list(5) in stretch. We'll need to come up with a generic term > > and use that instead; I'd suggest "APT source-list files".
I gave this a first shot. What do you think of the attached patch (should we do this via Salsa merge requests)? Paul
From b66a2abe7f870c75799ef5a51add26509720e927 Mon Sep 17 00:00:00 2001 From: Paul Gevers <elb...@debian.org> Date: Sun, 24 Mar 2019 20:31:48 +0100 Subject: [PATCH] Generalize use of APT source-list files Closes: #864017 --- en/old-stuff.dbk | 25 ++++++++++------ en/upgrading.dbk | 74 +++++++++++++++++++++++++----------------------- 2 files changed, 54 insertions(+), 45 deletions(-) diff --git a/en/old-stuff.dbk b/en/old-stuff.dbk index 0a53d737..5967ab3b 100644 --- a/en/old-stuff.dbk +++ b/en/old-stuff.dbk @@ -27,9 +27,9 @@ upgraded to the latest &oldreleasename; point release. </section> <section id="old-sources"> -<title>Checking your sources list</title> +<title>Checking your APT source-list files</title> <para> -If any of the lines in your <filename>/etc/apt/sources.list</filename> +If any of the lines in your APT source-list files refer to <quote><literal>stable</literal></quote>, it effectively points to &releasename; already. This might not be what you want if you are not ready yet for the upgrade. If you have already run @@ -43,28 +43,35 @@ that case you will have to decide for yourself whether you want to continue or not. It is possible to downgrade packages, but that is not covered here. </para> <para> -Open the file <filename>/etc/apt/sources.list</filename> with your favorite + Open the relevant APT source-list file, e.g. + <filename>/etc/apt/sources.list</filename>, with your favorite editor (as <literal>root</literal>) and check all lines beginning with <literal>deb http:</literal>, <literal>deb https:</literal>, -<literal>deb tor+http:</literal>, <literal>deb tor+https:</literal> or -<literal>deb ftp:</literal> for a reference to +<literal>deb tor+http:</literal>, <literal>deb tor+https:</literal>, +<literal>deb ftp:</literal>, <literal>URIs: http:</literal>, +<literal>URIs: https:</literal>, +<literal>URIs: tor+http:</literal>, <literal>URIs: tor+https:</literal> or +<literal>URIs: ftp:</literal> for a reference to <quote><literal>stable</literal></quote>. If you find any, change <literal>stable</literal> to <literal>&oldreleasename;</literal>. </para> <note> <para> - Lines in sources.list starting with <quote>deb ftp:</quote> and pointing to debian.org - addresses should be changed into <quote>deb http:</quote> lines. + Lines in APT source-list files starting with <literal>deb ftp:</literal> or + <literal>URIs: ftp:</literal>and pointing to debian.org + addresses should be changed into <literal>deb http:</literal> lines. </para> </note> <para> -If you have any lines starting with <literal>deb file:</literal>, you will have + If you have any lines starting with <literal>deb file:</literal> or + <literal>URIs: file:</literal>, you will have to check for yourself if the location they refer to contains an &oldreleasename; or a &releasename; archive. </para> <important> <para> - Do not change any lines that begin with <literal>deb cdrom:</literal>. + Do not change any lines that begin with <literal>deb cdrom:</literal> or + <literal>URIs: cdrom:</literal>. Doing so would invalidate the line and you would have to run <command>apt-cdrom</command> again. Do not be alarmed if a <literal>cdrom:</literal> source line refers to <quote><literal>unstable</literal></quote>. diff --git a/en/upgrading.dbk b/en/upgrading.dbk index b779789f..ffaba67a 100644 --- a/en/upgrading.dbk +++ b/en/upgrading.dbk @@ -293,7 +293,7 @@ $ apt-forktracer | sort package manager <command>aptitude</command>. If a package is scheduled for removal or update in the package manager, it might negatively impact the upgrade procedure. Note that correcting this is only possible if your - <filename>sources.list</filename> still points to <emphasis>&oldreleasename;</emphasis> + APT source-list files still point to <emphasis>&oldreleasename;</emphasis> and not to <emphasis>stable</emphasis> or <emphasis>&releasename;</emphasis>; see <xref linkend="old-sources"/>. </para> @@ -381,7 +381,7 @@ $ apt-forktracer | sort </para> <para> If there is anything you need to fix, it is best to make sure your - <filename>sources.list</filename> still refers to &oldreleasename; as explained in <xref + APT source-list files still refer to &oldreleasename; as explained in <xref linkend="old-sources"/>. </para> </section> @@ -389,23 +389,23 @@ $ apt-forktracer | sort <section id="proposed-updates"> <title>The proposed-updates section</title> <para> - If you have listed the <literal>proposed-updates</literal> section - in your <filename>/etc/apt/sources.list</filename> file, you - should remove it from that file before attempting to upgrade your - system. This is a precaution to reduce the likelihood of - conflicts. + If you have listed the <literal>proposed-updates</literal> section in + your APT source-list files, you should remove it from those files before + attempting to upgrade your system. This is a precaution to reduce the + likelihood of conflicts. </para> </section> <section id="unofficial-sources"> <title>Unofficial sources</title> <para> - If you have any non-Debian packages on your system, you should be aware that - these may be removed during the upgrade because of conflicting dependencies. - If these packages were installed by adding an extra package archive in your - <filename>/etc/apt/sources.list</filename>, you should check if that archive - also offers packages compiled for &releasename; and change the source line accordingly - at the same time as your source lines for Debian packages. + If you have any non-Debian packages on your system, you should be aware + that these may be removed during the upgrade because of conflicting + dependencies. If these packages were installed by adding an extra + package archive in your APT source-list files, you should check if that + archive also offers packages compiled for &releasename; and change the + source item accordingly at the same time as your source items for Debian + packages. </para> <para> Some users may have <emphasis>unofficial</emphasis> backported <quote>newer</quote> versions of packages that @@ -423,17 +423,18 @@ $ apt-forktracer | sort </section> <section id="upgrade-process"> - <title>Preparing sources for APT</title> + <title>Preparing APT source-list files</title> <para> Before starting the upgrade you must set up <systemitem - role="package">apt</systemitem>'s configuration file for package lists, - <filename>/etc/apt/sources.list</filename>. + role="package">apt</systemitem>'s configuration file(s) for package lists, + <filename>/etc/apt/sources.list</filename> and files under + <filename>/etc/apt/sources.list.d/</filename>. </para> <para> <systemitem role="package">apt</systemitem> will consider all packages that can - be found via any <quote><literal>deb</literal></quote> line, and install the package with the - highest version number, giving priority to the first line in the - file (thus where you have multiple mirror locations, you'd typically first name a local + be found via any configured archive, and install the package with the + highest version number, giving priority to the first entry in the + files (thus where you have multiple mirror locations, you'd typically first name a local hard disk, then <acronym>CD-ROM</acronym>s, and then remote mirrors). </para> @@ -482,7 +483,7 @@ $ apt-forktracer | sort </programlisting> <para> The default configuration is set up for installation from the main Debian Internet - servers, but you may wish to modify <filename>/etc/apt/sources.list</filename> + servers, but you may wish to modify the APT source-list files to use other mirrors, preferably a mirror that is closest to you in network terms. </para> <para> @@ -512,7 +513,7 @@ $ apt-forktracer | sort </para> <para> After adding your new sources, disable the previously existing - <quote><literal>deb</literal></quote> lines in <filename>sources.list</filename> by placing a + archive entries in the APT source-list files by placing a hash sign (<literal>#</literal>) in front of them. </para> </section> @@ -520,9 +521,9 @@ $ apt-forktracer | sort <section id="localmirror"> <title>Adding APT sources for a local mirror</title> <para> - Instead of using HTTP package mirrors, you may wish to modify - <filename>/etc/apt/sources.list</filename> to use a mirror on a local disk - (possibly mounted over <acronym>NFS</acronym>). + Instead of using HTTP package mirrors, you may wish to modify the APT + source-list files to use a mirror on a local disk (possibly mounted over + <acronym>NFS</acronym>). </para> <para> For example, your package mirror may be under @@ -543,7 +544,7 @@ $ apt-forktracer | sort </para> <para> After adding your new sources, disable the previously existing - <quote><literal>deb</literal></quote> lines in <filename>sources.list</filename> by placing a + archive entries in the APT source-list files by placing a hash sign (<literal>#</literal>) in front of them. </para> </section> @@ -551,10 +552,9 @@ $ apt-forktracer | sort <section id="cdroms"> <title>Adding APT sources from optical media</title> <para> - If you want to use <emphasis>only</emphasis> CDs (or DVDs or Blu-ray Discs), - comment out the existing - <quote><literal>deb</literal></quote> lines in <filename>/etc/apt/sources.list</filename> by - placing a hash sign (<literal>#</literal>) in front of them. + If you want to use <emphasis>only</emphasis> CDs (or DVDs or Blu-ray + Discs), comment out the existing entries in all the APT source-list files + by placing a hash sign (<literal>#</literal>) in front of them. </para> <para> Make sure there is a line in <filename>/etc/fstab</filename> that enables @@ -614,9 +614,11 @@ $ apt-forktracer | sort </screen> <para> Next you should double-check that the APT source entries (in - <filename>/etc/apt/sources.list</filename>) refer either to - <quote><literal>&releasename;</literal></quote> or to <quote><literal>stable</literal></quote>. There should not be - any sources entries pointing to &oldreleasename;. + <filename>/etc/apt/sources.list</filename> and files under + <filename>/etc/apt/sources.list.d/<filename>) refer either to + <quote><literal>&releasename;</literal></quote> or to + <quote><literal>stable</literal></quote>. There should not be any sources + entries pointing to &oldreleasename;. <note> <para> Source lines for a CD-ROM might sometimes refer to @@ -885,8 +887,8 @@ E: You don't have enough free space in /var/cache/apt/archives/. <para> - Note that in order to safely remove packages, it is advisable to switch your - <filename>sources.list</filename> back to &oldreleasename; as described in <xref + Note that in order to safely remove packages, it is advisable to switch + your APT source-list files back to &oldreleasename; as described in <xref linkend="old-sources"/>. </para> </section> @@ -983,8 +985,8 @@ E: Could not perform immediate configuration on '<replaceable>package</replaceab </para> <para> Another possible workaround for this problem is to temporarily add both - &oldreleasename; and &releasename; sources to your - <filename>sources.list</filename> and run <command>apt update</command>. + &oldreleasename; and &releasename; sources to your APT source-list files + and run <command>apt update</command>. </para> </section> -- 2.20.1
signature.asc
Description: OpenPGP digital signature