Fix timeouts.

2025-03-03 23:31:08 +00:00 · 2024-04-19 18:50:41 -05:00 · 2024-04-19 18:50:41 -05:00 · 4f1f85ef9c
commit 4f1f85ef9c
parent 5674431193
9 changed files with 12 additions and 0 deletions
--- 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
--- 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
--- 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 <arraybolt3@ubuntu.com>  Fri, 19 Apr 2024 17:38:06 -0500

--- 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"
--- 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":
--- 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*"
--- 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":
--- 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"
--- 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":