mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-25 11:37:56 +00:00
Code Issues Releases Activity

Revert r289269 for now. After looking at share/zoneinfo/Makefile this could

Browse Source 
potentially break non-root installs and we need a better solution, probably
by doing it differently when no UI is involved.
This commit is contained in:
Xin LI 2015-10-27 01:26:50 +00:00
parent 7eda8fb9ad
commit 427c435f64
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=290031
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/tzsetup/tzsetup.c
View File

@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
#include <time.h>
#include <unistd.h>
@ -945,18 +944,23 @@ main(int argc, char **argv)
if (argc - optind > 1)
usage();
if (chrootenv != NULL) {
rv = chroot(chrootenv);
if (rv != 0)
err(EX_OSERR, "chroot to %s", chrootenv);
if (chrootenv == NULL) {
strcpy(path_zonetab, _PATH_ZONETAB);
strcpy(path_iso3166, _PATH_ISO3166);
strcpy(path_zoneinfo, _PATH_ZONEINFO);
strcpy(path_localtime, _PATH_LOCALTIME);
strcpy(path_db, _PATH_DB);
strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK);
} else {
sprintf(path_zonetab, "%s/%s", chrootenv, _PATH_ZONETAB);
sprintf(path_iso3166, "%s/%s", chrootenv, _PATH_ISO3166);
sprintf(path_zoneinfo, "%s/%s", chrootenv, _PATH_ZONEINFO);
sprintf(path_localtime, "%s/%s", chrootenv, _PATH_LOCALTIME);
sprintf(path_db, "%s/%s", chrootenv, _PATH_DB);
sprintf(path_wall_cmos_clock, "%s/%s", chrootenv,
_PATH_WALL_CMOS_CLOCK);
}
strcpy(path_zonetab, _PATH_ZONETAB);
strcpy(path_iso3166, _PATH_ISO3166);
strcpy(path_zoneinfo, _PATH_ZONEINFO);
strcpy(path_localtime, _PATH_LOCALTIME);
strcpy(path_db, _PATH_DB);
strcpy(path_wall_cmos_clock, _PATH_WALL_CMOS_CLOCK);
/* Override the user-supplied umask. */
(void)umask(S_IWGRP | S_IWOTH);