git: 6f7c45056f69 - main - tzsetup: make UTC the first (default) region
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Oct 2023 23:36:00 UTC
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7c45056f6911b02e7c07011e3602775edad22d commit 6f7c45056f6911b02e7c07011e3602775edad22d Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-10-30 23:33:14 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> 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 <return> 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)