From 4f1f85ef9c286c3a49b5c0671ac388bbf6189a9f Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Fri, 19 Apr 2024 18:50:41 -0500 Subject: [PATCH] Fix timeouts. --- common/modules/before_bootloader_context.conf | 3 +++ common/modules/shellprocess_fixconkeys_part2.conf | 1 + debian/changelog | 2 ++ kubuntu/modules/pkgselect_context.conf | 1 + kubuntu/modules/pkgselect_snap_context.conf | 1 + lubuntu/modules/pkgselect_context.conf | 1 + lubuntu/modules/pkgselect_snap_context.conf | 1 + ubuntuunity/modules/pkgselect_context.conf | 1 + ubuntuunity/modules/pkgselect_snap_context.conf | 1 + 9 files changed, 12 insertions(+) diff --git a/common/modules/before_bootloader_context.conf b/common/modules/before_bootloader_context.conf index 88deecd..bc7906b 100644 --- a/common/modules/before_bootloader_context.conf +++ b/common/modules/before_bootloader_context.conf @@ -11,5 +11,8 @@ firmwareType: - command: sed -i '/deb http/d' /etc/apt/sources.list timeout: 10 - command: apt-get update + timeout: 10800 - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if grep -q 64 /sys/firmware/efi/fw_platform_size; then echo amd64-signed; else echo ia32; fi) + timeout: 10800 - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed + timeout: 10800 diff --git a/common/modules/shellprocess_fixconkeys_part2.conf b/common/modules/shellprocess_fixconkeys_part2.conf index 4e7d7fa..59b2b2c 100644 --- a/common/modules/shellprocess_fixconkeys_part2.conf +++ b/common/modules/shellprocess_fixconkeys_part2.conf @@ -1,4 +1,5 @@ --- dontChroot: false +timeout: 10800 script: - /usr/libexec/fixconkeys-part2 diff --git a/debian/changelog b/debian/changelog index 1db4a9e..4d82efa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ calamares-settings-ubuntu (1:24.04.36) noble; urgency=medium * Don't show Thunderbird as an installable third-party app on Kubuntu. (LP: #2062438) + * Correctly lengthen timeouts for network and initramfs package commands. + (LP: #2060429) -- Aaron Rainbolt Fri, 19 Apr 2024 17:38:06 -0500 diff --git a/kubuntu/modules/pkgselect_context.conf b/kubuntu/modules/pkgselect_context.conf index ed95361..74aa744 100644 --- a/kubuntu/modules/pkgselect_context.conf +++ b/kubuntu/modules/pkgselect_context.conf @@ -1,5 +1,6 @@ --- dontChroot: false +timeout: 10800 "packages.minimalButton": true: - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove kmahjongg kmines kpat ksudoku skanlite skanpage okular libreoffice* kdeconnect krdc konversation neochat elisa haruna vim snapd partitionmanager usb-creator* plasma-welcome kde-config-tablet plasma-welcome" diff --git a/kubuntu/modules/pkgselect_snap_context.conf b/kubuntu/modules/pkgselect_snap_context.conf index 8340c1d..2a045ec 100644 --- a/kubuntu/modules/pkgselect_snap_context.conf +++ b/kubuntu/modules/pkgselect_snap_context.conf @@ -1,5 +1,6 @@ --- dontChroot: true +timeout: 10800 "packages.elementButton": true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop" "packages.kritaButton": diff --git a/lubuntu/modules/pkgselect_context.conf b/lubuntu/modules/pkgselect_context.conf index 55b859a..6b304fe 100644 --- a/lubuntu/modules/pkgselect_context.conf +++ b/lubuntu/modules/pkgselect_context.conf @@ -1,5 +1,6 @@ --- dontChroot: false +timeout: 10800 "packages.minimalButton": true: - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove snapd lubuntu-snap-installation-monitor vlc plasma-discover transmission-qt quassel 2048-qt featherpad noblenote kcalc qps zsync partitionmanager qapt-deb-installer picom qlipper qtpass libreoffice*" diff --git a/lubuntu/modules/pkgselect_snap_context.conf b/lubuntu/modules/pkgselect_snap_context.conf index 8340c1d..2a045ec 100644 --- a/lubuntu/modules/pkgselect_snap_context.conf +++ b/lubuntu/modules/pkgselect_snap_context.conf @@ -1,5 +1,6 @@ --- dontChroot: true +timeout: 10800 "packages.elementButton": true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop" "packages.kritaButton": diff --git a/ubuntuunity/modules/pkgselect_context.conf b/ubuntuunity/modules/pkgselect_context.conf index a6f148a..a0718db 100644 --- a/ubuntuunity/modules/pkgselect_context.conf +++ b/ubuntuunity/modules/pkgselect_context.conf @@ -1,5 +1,6 @@ --- dontChroot: false +timeout: 10800 "packages.minimalButton": true: - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove snapd aisleriot atril cheese simple-scan gdebi gparted *kvantum* libreoffice* gnome-mahjongg gnome-mines remmina rhythmbox shotwell gnome-sudoku synaptic transmission-gtk vlc stacer" diff --git a/ubuntuunity/modules/pkgselect_snap_context.conf b/ubuntuunity/modules/pkgselect_snap_context.conf index 8340c1d..2a045ec 100644 --- a/ubuntuunity/modules/pkgselect_snap_context.conf +++ b/ubuntuunity/modules/pkgselect_snap_context.conf @@ -1,5 +1,6 @@ --- dontChroot: true +timeout: 10800 "packages.elementButton": true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop" "packages.kritaButton":