From nobody Fri Oct 13 16:33:20 2023 X-Original-To: dev-commits-src-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 4S6XB90TKYz4wSvK; Fri, 13 Oct 2023 16:33:21 +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 4S6XB875GPz3gXZ; Fri, 13 Oct 2023 16:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697214801; 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=aBu4c8OBpYb+aReJlbFOkJEPuMvwIf3QHNt6MTjJEgo=; b=QXi/c/oANlhfKvSx+02v30Md9pQqmuQhqRSnwF85+uXIgNiBvEjf/zE8t4swqVmB/nnwef yTZrfNSUMSmn9CCu1OForlvAsI49lNRA2+YmrOhgJosPJ3K2v2VJbgXtVmasv42zfwSBFV ZB43cwW3BfJGPjh+U88lfP9359Xm85DOyGwLZUAhNJtPDJihHfN4haAVU2OAyImkVazc0z FIzk9c4LxYlbN19xKPRvJst/57GqorfDrMM05JWI1O23A2kCE9BoylnliLEWUvQ6ffImo1 mNWZqNiJzzBDsEhBEbhSOTUSEEgNVX0q8K7Gw1AinNMeRYhfRXukZKcejYmCQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697214801; a=rsa-sha256; cv=none; b=NKg/KAGFX9fSJIgKCYl5f8v0ONIzH92zTehWM5LcLDIWNcXQIdIAvJzUxQGztBhB4f7g5g KL6/VKI4Hx9rZPswMuVWKP+sMK/bTjE0ZAOtP8zIZRN0SBQxJd5ow3c3ZR+Prjri2SO4Me J9ZUfnT4UVPXxPX6wvDH18N4bkVCt+RLeRAHmiELtZpQYyIYWFd6XOBR2/EcXYwEdHFiMS tbuT0orxfKi4VVVsnG43nXm2yOPn+aEEuQ8b8+yTqk0pqaZ9uOcHz+8ohf4uOnQF0DKYYi 37dOkunG6PjFbJL4E6SQ4xA613PIl9icAJSKEfX7mDVEFPAr/vYa731RUYmFkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697214801; 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=aBu4c8OBpYb+aReJlbFOkJEPuMvwIf3QHNt6MTjJEgo=; b=PDmZONwuaEicNU3VwrbvFqee/5dlUGudcpPEBoYpvuW9XLl/ftUioj6OuUs1/zV0oe5oY+ 9iaQPWskosbQdzNNliN2TQ3+2SZv8Mn18qcsyu07l0lRV+ncjUysH1cBACUM4YDvOBqSnj ySQGNHW5F0Ut4wUEWav+d3hV/mnSgW/j2PJgge45kvaGH3qylXHrDtkk222HhocZHGtczA eA8oBnpBUpPaB1p8gn6TiT6ayWPvy0dXT6KJjE8oinedGccIfvBiymU+2+wkJeUMitiU9I xpAbgK66pprB44lAp7bqCk+hMeWVjl6p95lFbAG0qR3wqvjw2d7OXYHx0GsVZw== 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 4S6XB867Yxzvkt; Fri, 13 Oct 2023 16:33:20 +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 39DGXKJM097882; Fri, 13 Oct 2023 16:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DGXKUX097880; Fri, 13 Oct 2023 16:33:20 GMT (envelope-from git) Date: Fri, 13 Oct 2023 16:33:20 GMT Message-Id: <202310131633.39DGXKUX097880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 01ab86f7e6a6 - main - bsdinstall: reset the mirror when restarting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01ab86f7e6a6bf540e7c302a7f7b385f20fa4a3f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=01ab86f7e6a6bf540e7c302a7f7b385f20fa4a3f commit 01ab86f7e6a6bf540e7c302a7f7b385f20fa4a3f Author: Pierre Pronchery AuthorDate: 2023-10-12 20:34:06 +0000 Commit: Ed Maste CommitDate: 2023-10-13 16:32:38 +0000 bsdinstall: reset the mirror when restarting It is possible to restart the installation process upon errors, when installing normally through the `auto` script, or when setting up a jail with the `jail` script. However, some values obtained interactively from the user or guessed by some scripts are kept in the environment when restarting the process; this makes it impossible to run some steps as expected after the restart. For instance, if a bad choice of mirror was made in the `mirrorselect` phase, restarting the installer remembers the choice made, and will never prompt for a different one. Rebooting is then the only easy way out of this situation. This change only affects the `jail` script for now, as otherwise there is no way to tell if the value had been specifically set by the user before starting bsdinstall. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42183 --- usr.sbin/bsdinstall/scripts/jail | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index ab095f44ba39..feb9d8b1c097 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -49,6 +49,7 @@ error() { if [ $? -ne $BSDDIALOG_OK ]; then exit else + [ -z "$MIRROR_BUTTON" ] || unset BSDINSTALL_DISTSITE exec $0 $BSDINSTALL_CHROOT fi }