From nobody Sat Dec 2 00:54:50 2023 X-Original-To: dev-commits-src-branches@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 4Shs0B2nrRz52nB3; Sat, 2 Dec 2023 00:54:50 +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 4Shs0B22gTz4gJN; Sat, 2 Dec 2023 00:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478490; 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=bZnTIiaKL83t1pEQ4IWzb3rPyx253lCEBKvb2EcjX2c=; b=Ocj+PKquGSgVmV1zxfYttjpis36nwLnf9KYIVk0k2DJZqpuN1tyNohj95+kR0Si7eU1/O/ eNo4lKY8+Ym4FYwqdYvWvh94CbP96xHPQSHJIYpBdI7oypoeEMk5b3ZFFMlDMuaTZPVvpt Sk/6IwqofMSmM5YxF55zFf9/WJRpxszHPy3NFICFLYMQqQkf4TryU3DCb8eM+nykpp+Gpo cnGSL/neNTnkZxmNChkosqLzERXEPpP7x9GEH8blBk0LXxp0EyXP/S/O7HXX+N7cjExUef paJSXs1sSbmTE+mwtMdB31ZifYl95yig7xq17SdHJws1Du+5tDNV1z/U6XFmZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478490; 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=bZnTIiaKL83t1pEQ4IWzb3rPyx253lCEBKvb2EcjX2c=; b=Di6b9dMdRJ7228W89JY6TBywKaLY62RitHItFlyqnCFkp+2+y7EMt3+twlRzgAvBdIzGxp bpMEIjkni65irPl/8VeZEWgoJaedSxakX5V8pIkLUxIrjgyt4i0OgQqgJ6mEKeX0UYP6fY RDqDJTB0+BxYxyZpb9IE+o5iEIT01+UPaeYFj+CRVubIstINeaTocamMm5cO+Ly/6whjAn Ofrqe94U57eqJou2wCwZDVIqhDHIU7ydNXmW4kjMDxXfF1066lxf+Wn7AUGjKKuyphKHCM UxzT4y/BGkTMTvMaeGTakyhwfhBUUF0aMdCcYNIXr3HVq2sZ0rqu9xNTlA8CAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478490; a=rsa-sha256; cv=none; b=E2nI0RTJkfTJaOiZZp3pbHBMFq47ig/QEH2ypp1dmJZLapoa7wSlt2nlgP3QrOhwd/nSto tGjR7tWFsm8/L735mUaQ+BVFJeJeqW+fLFxddVZx8Den6c5Nwfu5L0Pv3/LxqX+tgayFnd eJPs6AgvzFPWyw6ybz6dxIu1HFby2ZQC6ZQ8BqCzZTsNxZfH9e68Lu33rS5kOveyKZfRP8 2Uo8JM+vXSJTtPeE1R44x69FvXfvc2Tdp8wiHX+aYhr5rPGfSAL8d3Ni8iByepvzKJ4OzI vMGRwcjJ2gcp+xD84Cw+IVzHH4spBo3vjqKwy1tW95VqrY/HegoQ9dNYqZJTaw== 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 4Shs0B0nYQzvwy; Sat, 2 Dec 2023 00:54:50 +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 3B20so9i024791; Sat, 2 Dec 2023 00:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20soM6024788; Sat, 2 Dec 2023 00:54:50 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:50 GMT Message-Id: <202312020054.3B20soM6024788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b67fd157b2f6 - stable/14 - tzsetup: make UTC the first (default) region List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b67fd157b2f66a8ddf057378406940708597ca95 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b67fd157b2f66a8ddf057378406940708597ca95 commit b67fd157b2f66a8ddf057378406940708597ca95 Author: Brooks Davis AuthorDate: 2023-10-30 23:33:14 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:03:25 +0000 tzsetup: make UTC the first (default) region Many sysadmins prefer to configure their systems to UTC and it's a reasonable default when installing, making it easier to get a usable system by just hitting repeatidly. Renumber UTC to 0 to preserve the finger memory of those selecting a region by shortcut. Reviewed by: jrtc27, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42383 (cherry picked from commit 6f7c45056f6911b02e7c07011e3602775edad22d) --- usr.sbin/tzsetup/tzsetup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 4279f888a33f..f6440a0ea736 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -171,6 +171,7 @@ static struct continent_names { const char *name; struct continent *continent; } continent_names[] = { + { "UTC", &utc }, { "Africa", &africa }, { "America", &america }, { "Antarctica", &antarctica }, @@ -181,13 +182,13 @@ static struct continent_names { { "Europe", &europe }, { "Indian", &indian }, { "Pacific", &pacific }, - { "UTC", &utc } }; static struct continent_items { char prompt[3]; char title[30]; } continent_items[] = { + { "0", "UTC" }, { "1", "Africa" }, { "2", "America -- North and South" }, { "3", "Antarctica" }, @@ -198,14 +199,13 @@ static struct continent_items { { "8", "Europe" }, { "9", "Indian Ocean" }, { "10", "Pacific Ocean" }, - { "11", "UTC" } }; #define NCONTINENTS \ (int)((sizeof(continent_items)) / (sizeof(continent_items[0]))) static dialogMenuItem continents[NCONTINENTS]; -#define OCEANP(x) ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9) +#define OCEANP(x) ((x) == 4 || (x) == 6 || (x) == 9 || (x) == 10) static int continent_country_menu(dialogMenuItem *continent)