mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-30 05:36:10 +00:00
Revert "tzsetup: ask local/UTC question only on x86"
I am unsure if AArch64 Windows systems keep UTC or local time in the RTC
by default, so keep tzsetup consistent across architectures for now.
This reverts commit aa6fb1d277
.
Reported by: Mark Millard
This commit is contained in:
parent
f354ca7383
commit
c6030b3804
|
@ -63,7 +63,6 @@ Skip the initial question about adjusting the clock if not set to UTC.
|
|||
will neither create nor delete
|
||||
.Pa /etc/wall_cmos_clock .
|
||||
On a newly installed system, the hardware clock will keep UTC.
|
||||
This option is enabled automatically on non-x86 hardware.
|
||||
.El
|
||||
.Pp
|
||||
It is possible to short-circuit the menu system by specifying the
|
||||
|
|
|
@ -826,28 +826,23 @@ main(int argc, char **argv)
|
|||
char prompt[128];
|
||||
int fd;
|
||||
#endif
|
||||
int c, rv;
|
||||
bool skiputc;
|
||||
char *dztpath;
|
||||
#if defined(__i386__) || defined(__amd64__)
|
||||
int c, rv, skiputc;
|
||||
char vm_guest[16] = "";
|
||||
size_t len = sizeof(vm_guest);
|
||||
char *dztpath;
|
||||
|
||||
skiputc = false;
|
||||
|
||||
/* Default skiputc to true for VM guests */
|
||||
if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 &&
|
||||
strcmp(vm_guest, "none") != 0)
|
||||
skiputc = true;
|
||||
#else
|
||||
skiputc = true;
|
||||
#endif
|
||||
dztpath = NULL;
|
||||
skiputc = 0;
|
||||
|
||||
#ifdef HAVE_BSDDIALOG
|
||||
setlocale(LC_ALL, "");
|
||||
#endif
|
||||
|
||||
/* Default skiputc to 1 for VM guests */
|
||||
if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 &&
|
||||
strcmp(vm_guest, "none") != 0)
|
||||
skiputc = 1;
|
||||
|
||||
while ((c = getopt(argc, argv, "C:d:nrs")) != -1) {
|
||||
switch (c) {
|
||||
case 'C':
|
||||
|
@ -866,7 +861,7 @@ main(int argc, char **argv)
|
|||
#endif
|
||||
break;
|
||||
case 's':
|
||||
skiputc = true;
|
||||
skiputc = 1;
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
|
@ -956,7 +951,7 @@ main(int argc, char **argv)
|
|||
if (bsddialog_init() == BSDDIALOG_ERROR)
|
||||
errx(1, "Error bsddialog: %s\n", bsddialog_geterror());
|
||||
|
||||
if (!skiputc) {
|
||||
if (skiputc == 0) {
|
||||
snprintf(prompt, sizeof(prompt),
|
||||
"Is this machine's CMOS clock set to UTC? "
|
||||
"If it is set to local time,\n"
|
||||
|
|
Loading…
Reference in a new issue