nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrades: Drop unattended-upgrade call from dist-upgrade

Browse Source 
unattended-upgrade will take a very long time to run, and won't be able
to upgrade most of the packages. There is not much benefit to running it
here.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2025-02-05 17:16:17 -05:00 committed by Sunil Mohan Adapa
parent d0e25e5239
commit 5544eff707
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plinth/modules/upgrades/privileged.py
View File

@ -60,8 +60,6 @@ DIST_UPGRADE_PACKAGES_WITH_PROMPTS = [
'mumble-server', 'radicale', 'roundcube-core', 'tt-rss' 'mumble-server', 'radicale', 'roundcube-core', 'tt-rss'
] ]
DIST_UPGRADE_PRE_INSTALL_PACKAGES = ['base-files']
DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: list[str] = [ DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: list[str] = [
# Tell grub-pc to continue without installing grub again. # Tell grub-pc to continue without installing grub again.
'grub-pc grub-pc/install_devices_empty boolean true' 'grub-pc grub-pc/install_devices_empty boolean true'
@ -479,12 +477,6 @@ def _perform_dist_upgrade():
print('Updating Apt cache...', flush=True) print('Updating Apt cache...', flush=True)
run_apt_command(['update']) run_apt_command(['update'])
# Install packages that are necessary for unattended-upgrades
# to start the dist upgrade.
print(f'Upgrading packages: {DIST_UPGRADE_PRE_INSTALL_PACKAGES}...',
flush=True)
run_apt_command(['install'] + DIST_UPGRADE_PRE_INSTALL_PACKAGES)
# Pre-set debconf selections if they are required during the # Pre-set debconf selections if they are required during the
# dist upgrade. # dist upgrade.
if DIST_UPGRADE_PRE_DEBCONF_SELECTIONS: if DIST_UPGRADE_PRE_DEBCONF_SELECTIONS:
@ -493,13 +485,6 @@ def _perform_dist_upgrade():
f'{DIST_UPGRADE_PRE_DEBCONF_SELECTIONS}', flush=True) f'{DIST_UPGRADE_PRE_DEBCONF_SELECTIONS}', flush=True)
debconf_set_selections(DIST_UPGRADE_PRE_DEBCONF_SELECTIONS) debconf_set_selections(DIST_UPGRADE_PRE_DEBCONF_SELECTIONS)
# This will upgrade most of the packages.
# Previously, when dist-upgrading from bullseye to bookworm, there was
# an issue where unattended-upgrade gets stuck. See #2266. However, it
# does not get stuck when dist-upgrading from bookworm to trixie.
print('Running unattended-upgrade...', flush=True)
subprocess.run(['unattended-upgrade', '--verbose'], check=False)
# Remove obsolete packages that may prevent other packages from # Remove obsolete packages that may prevent other packages from
# upgrading. # upgrading.
if DIST_UPGRADE_OBSOLETE_PACKAGES: if DIST_UPGRADE_OBSOLETE_PACKAGES: