mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 01:01:06 +00:00
Default bsdconfig timezone' and
tzsetup' to `-s' in a VM.
Recommended by: cperciva Reviewed by: cperciva Relnotes: tzsetup and bsdconfig now assume that the "hardware" clock inside a VM is set to UTC
This commit is contained in:
parent
7a3659bcac
commit
e91afc1cda
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=274394
|
@ -62,7 +62,7 @@ _PATH_WALL_CMOS_CLOCK="/etc/wall_cmos_clock"
|
|||
REALLYDOIT=1
|
||||
REINSTALL=
|
||||
USEDIALOG=1
|
||||
SKIPUTC=
|
||||
SKIPUTC= # See MAIN
|
||||
VERBOSE=
|
||||
TZ_OR_FAIL=
|
||||
CHROOTENV=
|
||||
|
@ -119,6 +119,9 @@ dialog_menu_main()
|
|||
|
||||
############################################################ MAIN
|
||||
|
||||
# Skip initial question regarding UTC v. Wall-Clock time if run in VM
|
||||
[ "$( sysctl -n kern.vm_guest 2> /dev/null )" = "none" ] || SKIPUTC=1
|
||||
|
||||
# Incorporate rc-file if it exists
|
||||
[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
|
|||
#include <sys/param.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include <dialog.h>
|
||||
|
||||
|
@ -910,8 +911,16 @@ main(int argc, char **argv)
|
|||
{
|
||||
char title[64], prompt[128];
|
||||
int c, fd, rv, skiputc;
|
||||
char vm_guest[16] = "";
|
||||
size_t len = sizeof(vm_guest);
|
||||
|
||||
skiputc = 0;
|
||||
|
||||
/* 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:nrs")) != -1) {
|
||||
switch(c) {
|
||||
case 'C':
|
||||
|
|
Loading…
Reference in a new issue