Verified Commit 14fa8b40 authored by anarcat's avatar anarcat
Browse files

split conflict resolution guidance into procedure and issues items

parent 42b3b0d9
Loading
Loading
Loading
Loading
+32 −17
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ privilege of having a console), you may want to [upgrade SSH first](https://www.
as it has a longer downtime period, especially if you are on a flaky
connection.

See the "conflicts resolution" section below for how to handle
`clean_conflicts` output.

 1. Preparation:

        : reset to the default locale
@@ -146,6 +149,29 @@ connection.

[this guide to free up space]: http://www.debian.org/releases/buster/amd64/release-notes/ch-upgrading.en.html#sufficient-space

## Conflicts resolution

When the `clean_conflicts` script gets run, it asks you to check each
configuration file that was modified locally but that the Debian
package upgrade wants to overwrite. You need to make a decision on
each file. This section aims to provide guidance on how to handle
those prompts.

 * those config files should be manually checked on each host:
 
         /etc/default/grub.dpkg-dist

 * the following files can be safely removed (answer `n`):
 
        /etc/cron.daily/bsdmainutils.dpkg-remove
        /etc/ca-certificates.conf.dpkg-old
        /etc/ldap/ldap.conf.dpkg-dist
        /etc/default/prometheus-node-exporter.dpkg-dist
        /etc/apt/apt.conf.d/50unattended-upgrades.dpkg-dist
        /etc/unbound/unbound.conf.dpkg-dist

Other unresolved files are noted in the Issues section below.

# Service-specific upgrade procedures

## RT and PostgreSQL upgrades
@@ -410,27 +436,16 @@ See also the official list of [known issues](https://www.debian.org/releases/bul
        /etc/syslog-ng/syslog-ng.conf
        /etc/sudoers

 * the following config files should be updated in Puppet:
 * the following config files should be updated in Puppet, but in the
   meantime should be ignored:
 
        /etc/apt/apt.conf.d/50unattended-upgrades

 * the following config changes proposed upstream can be completely
   ignored, possibly by `clean_conflicts`?
   
        /etc/default/prometheus-node-exporter
        /etc/ldap/ldap.conf
        /etc/ca-certificates.conf
        /etc/default/grub

 * the following config changes can be ignored until we complete the
   bullseye upgrade, at which point they should be fixed (this can be
   postponed to bookworm):
   
        /etc/unbound/unbound.conf

 * the following files can be safely removed:
 
        /etc/cron.daily/bsdmainutils.dpkg-remove
   Note that unattended-upgrades is a third party module and would
   require significant work to catchup with the Debian package. The
   `unbound.conf` file needs a bullseye-specific upgrade, as the
   `include-toplevel` instruction does not work in buster.

 * The official list of [known issues][]