From nobody Mon Oct 30 23:36:00 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 4SK8m05v3rz4yZ5p; Mon, 30 Oct 2023 23:36:00 +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 4SK8m0535lz4WmP; Mon, 30 Oct 2023 23:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698708960; 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=CFSIh1TTrztCjFW23m022zPiPAZdKvtWtai/8bPbEu8=; b=It4hny9TdWLB/ToWSoGujgMZv+ODJ99Qq1glvcT0YsdomIdqc6142FCGU54VWIRdrEplcl eLgGg2vm3a16+BMwMySNNK31uxeRvt4Ts2Z0UcrYX23D+NRZ9I5+D9e51L41Dh4OGdVMML Yml5foHt96O9M5asw9dDtu6E/3MxcLt3xtkO81D5MDz82ydn5ut6SM2P+ghj1vvZ+JSWa7 tPXvPJvPykv4Pd8KhV+fzV6rrQiqe83ODeE09bZyydoMi70pHhSpZXQL7/9/oPCTnHnwnr ptjZaYYGd9lOfzM84i7k9up69Ok4Y+amiR2Kq+cIeo2ljAklDM4GuytYSZTklw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698708960; 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=CFSIh1TTrztCjFW23m022zPiPAZdKvtWtai/8bPbEu8=; b=ymHnLkCGaES72NsvUFe4rfQxlpKVbNwPK/0R4/h1de/TsPQOhSTWqIAJUoA/84UhcSZx5P GYKeN0tU1DxG90/Dy3kWwOK/aXMuUldGNmck+rW6u+21hIwyXi9mnfXAQVVL8sOb6FAJKv opQsAnh7Id5ogCG3FHL/yfj0DZGt2Ws8CRvE2SBS+6N5VTo497uuMziRG91WtVkZ2YmQC0 XmqP9a3ncb2zPR7xT4w5MgCL0JH6rIrbtc2zBZMuq1bgnHVxfcBN0QJw9WSlrqsi2ry6fP qTjoHCGwdCQnHY6cJxDHeATXZq3PJC2Z0snMnzpKTlsIjkD/Qsp22Zm/Cnl8WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698708960; a=rsa-sha256; cv=none; b=cTZWZkd5A2j8j5EJYL9xXWSLarQKHGxeVDpnMKoKiSGB+I3zx7tK9o41Ri4lLOgNZZXrfa pmo/iJlKMBOXuo+3XfPKjAKivR5tFa+G8ENVWvepZCOleQHovt1/hHtlTLt6VIwk5dSNmg rzVFJzO8zTl9ZICeNUPdwdd1XUnyFEgT0H3C8H8Vvyz14USBvYXqTbWy5deIsllZDuAbi6 fiuQjmes9pvn0IfEq+hcLaWCC3zPXOGIXRzzrEa2xpJ5CtRF4C+TJLIoncHIe0iI26XAgA Yl5w1SRfFu7RFw4Z+5ExraPRaCZwv1Pbvtj/7S3+0NUQx7ao+mc/fWxd6Jes7A== 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 4SK8m045pjzh3y; Mon, 30 Oct 2023 23:36:00 +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 39UNa04A095111; Mon, 30 Oct 2023 23:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UNa0hl095108; Mon, 30 Oct 2023 23:36:00 GMT (envelope-from git) Date: Mon, 30 Oct 2023 23:36:00 GMT Message-Id: <202310302336.39UNa0hl095108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6f7c45056f69 - main - tzsetup: make UTC the first (default) region 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f7c45056f6911b02e7c07011e3602775edad22d Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7c45056f6911b02e7c07011e3602775edad22d commit 6f7c45056f6911b02e7c07011e3602775edad22d Author: Brooks Davis AuthorDate: 2023-10-30 23:33:14 +0000 Commit: Brooks Davis CommitDate: 2023-10-30 23:35:21 +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 --- 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)