From nobody Tue Jan 30 21:26:29 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPdX53khNz57d7C; Tue, 30 Jan 2024 21:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPdX53DBgz4svn; Tue, 30 Jan 2024 21:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706649989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rZ6Y7pV9vGUIxT/UQROtMkZ/xLd4GfNGiYpsotrAzlE=; b=sT91Vl8y74YPdJKwXCPfTfi1wKjiWx0ezlWJM9b14RjGngaf0g9Ft6wy+K8I9Zlk+BjGWo tcCPDLxyM3vNtkoFVku8h/sH6nUDNXP71nwcRTZ6ut6riHtRYUIbw11glyQI3hTgL9wtpd WDDisgLbm7vx7kAUpp6JS+VWR/f3Eo88CyM9qpFit4Ftk0FhJbonxcqjDNp5N7zGIYmgwZ ePNbqU1flGgaxVK1/rWo6AFUYuAdihvWHtYIyYEGTEefYcFuFt667s9XmoxiGAMNXGI4y7 KZelkhlicLWpHgJJsP5qnPRMS6PJs9P/FWRqq3EmdUe5JMe1dqjzaV/RWvpS8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706649989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rZ6Y7pV9vGUIxT/UQROtMkZ/xLd4GfNGiYpsotrAzlE=; b=tJdpwGA5lhHyoKBpVkbFwFh5q+I8CQQQcwccTkHsqUAhTRQ7Zs9iIZiVxXRHmYaEtNaH/K fqWU7if7h5dYSt6SQ6UlleWFOZ/uASB/PkxPxVhkNRf9CkFt8vJiXiyU+ESo9kvt1gOXEj Mi8ad/od79xqcQv+ZsAcYpdkshsbmyWxxQ/piTbgOLKObTkVSmE4HXzwH9s4UsOYFRbINn x8lPcKLLCoYZJVAHGHmmWWE40StgNx7FgynGUEMtv9GwLjVoH/hgvnkKuKz+JV6bYMO0Th scfn5I+JTHpyiqMWYRsY+etQGP1RC+zcTw484pBjurOR6v5Y7wr2JRL5sJL2YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706649989; a=rsa-sha256; cv=none; b=XLdngnb5DlFrAy8Z2+m+46temik0yT2a2W0b7gB7UCssM6Auq34FceSfoUVJvEJnIdOoBY mc8Vu1kICGUotAzl7UO8KnFg2PB7tX2F/PyLdZ+qWBjZxnR/TcSy4GaikEhBIkkULFRZMh ajQFIv+FUzqIYQlep7nZG1m1mfZx1XJFqOKdbIGIO3yl+iAbht/K3zwSz+LYvLuIMRUgf7 30WzlRK+eVwoiDFfYn4YFHjt9hvj351f9LvOPSjjhyLdMwaRM//k1zkPNXW1bXDJFGaxn0 iof1iODN3JwrbTr/nYeNx8Jg/mnQo9rN5HaGnSYpUlxI5rsUC2Pg3OXvF6+CYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPdX52HsYzrc1; Tue, 30 Jan 2024 21:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40ULQTPq024175; Tue, 30 Jan 2024 21:26:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ULQTmq024172; Tue, 30 Jan 2024 21:26:29 GMT (envelope-from git) Date: Tue, 30 Jan 2024 21:26:29 GMT Message-Id: <202401302126.40ULQTmq024172@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Colin Percival Subject: git: 39126a2d9768 - main - sysutils/firstboot-freebsd-update: HTTP_TIMEOUT=5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39126a2d9768e46e0fe8795c815721d122adadad Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/ports/commit/?id=39126a2d9768e46e0fe8795c815721d122adadad commit 39126a2d9768e46e0fe8795c815721d122adadad Author: Colin Percival AuthorDate: 2024-01-30 21:20:11 +0000 Commit: Colin Percival CommitDate: 2024-01-30 21:26:23 +0000 sysutils/firstboot-freebsd-update: HTTP_TIMEOUT=5 If a system with firstboot_freebsd_update_enable="YES" boots without access to the FreeBSD Update mirrors (e.g. an EC2 instance which has an EC2 security group settings which block outbound HTTP) the boot will hang until it times out. The default timeout of 120 seconds is suboptimal. Run freebsd-update with a timeout of 5 seconds, and bump the package version to 1.4 to reflect this change. Reported by: mgrooms@shrew.net PR: 276720 Sponsored by: https://www.patreon.com/cperciva --- sysutils/firstboot-freebsd-update/Makefile | 2 +- sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/firstboot-freebsd-update/Makefile b/sysutils/firstboot-freebsd-update/Makefile index ae3a9d035acc..9c8499be35a6 100644 --- a/sysutils/firstboot-freebsd-update/Makefile +++ b/sysutils/firstboot-freebsd-update/Makefile @@ -1,5 +1,5 @@ PORTNAME= firstboot-freebsd-update -PORTVERSION= 1.3 +PORTVERSION= 1.4 CATEGORIES= sysutils MASTER_SITES= # none DISTFILES= # none diff --git a/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in b/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in index 220825e87710..b5f6d5bccfe1 100644 --- a/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in +++ b/sysutils/firstboot-freebsd-update/files/firstboot_freebsd_update.in @@ -41,7 +41,7 @@ firstboot_freebsd_update_run() esac fi - freebsd-update --not-running-from-cron fetch + env HTTP_TIMEOUT=5 freebsd-update --not-running-from-cron fetch if [ -e /var/db/freebsd-update/`echo / | sha256`-install ]; then freebsd-update install echo "Requesting reboot after installing updates."