From nobody Fri Aug 30 07:04:04 2024 X-Original-To: dev-commits-src-all@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 4Ww8KR128Wz5TD6X; Fri, 30 Aug 2024 07:04:43 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (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 ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ww8KP4gggz4Jqb; Fri, 30 Aug 2024 07:04:41 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=db81LrCG; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at Date: Fri, 30 Aug 2024 09:04:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1725001473; bh=9hmkor3SXzUp8azu8bb5G63YrGgIsEvJYO56LTg+W84=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=db81LrCGtHPUKFwBQmD6xgJ0gya9xl9lLppw1Hf/gNQJDDnl/4MO8XobphICc4gZV 8E5UM6nC9yMpD10eLWqta6pfBAg1nHHa0+pq+WGCCYDezot0PkDQBU3VWWIubnsYK7 2XF6yDFtUZ2UPQmXArrK7qxjQVhq9JS7X0/SVWWm3ipCXUBK+x8cZuyoLqkIrAa2hx zG39DWqUbVWGpcqAnTSGlSaMYi4uQCqmn+OfX737Q9h8gPjhkWvK3jup8pMJBOsxTK uPHN9GoRZzkvGgMgZEApvJ2xmefR9auzhuxa8LYULGfPfOQWLXuZnBvHW1l8mnYr+E 2zQR+/6cogE5g== Message-ID: <87zfoujxuj.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: "Sean C. Farley" Cc: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: fc43a1b6842a - stable/14 - tzsetup: symlink /etc/localtime instead of copying In-Reply-To: <87cylubd5v.wl-herbert@gojira.at> References: <202408011538.471FcJDS026885@gitrepo.freebsd.org> <784ce21d-a604-bb91-c52e-29c78e2bb6e4@FreeBSD.org> <87cylubd5v.wl-herbert@gojira.at> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DMARC_NA(0.00)[gojira.at]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-branches@FreeBSD.org]; DKIM_TRACE(0.00)[gojira.at:+] X-Rspamd-Queue-Id: 4Ww8KP4gggz4Jqb On Tue, 27 Aug 2024 10:09:00 +0200, "Herbert J. Skuhra" wrote: > > On Thu, 08 Aug 2024 06:35:38 +0200, "Sean C. Farley" wrote: > > > > On Thu, 1 Aug 2024, Ed Maste wrote: > > > > > The branch stable/14 has been updated by emaste: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=fc43a1b6842afa806dfd7ba48de5bece63d04456 > > > > > > commit fc43a1b6842afa806dfd7ba48de5bece63d04456 > > > Author: Ed Maste > > > AuthorDate: 2022-10-14 16:44:35 +0000 > > > Commit: Ed Maste > > > CommitDate: 2024-08-01 15:11:45 +0000 > > > > > > tzsetup: symlink /etc/localtime instead of copying > > > > > > Using a symlink means that new timezone data (installed by an errata > > > update, say) will be usable without having to be copied again. > > > > > > Reviewed by: bapt, kevans, philip > > > Sponsored by: The FreeBSD Foundation > > > Differential Revision: https://reviews.freebsd.org/D37005 > > > > > > (cherry picked from commit 5e16809c953f4cd19fadb1767469dec319de0353) > > > > I ran across an issue with this when using "etcupdate -D" to update a > > jail from the host. "tzsetup -r -C /tmp/chroot", as called by > > etcupdate, prepends the path of the chroot to the link which breaks > > things inside the jail. > > I have this issue whenerver I update jails with 'make installworld > DESTDIR=$X'. Will this be fixed or reverted (at least) in stable/14? > Or works as expected? Maybe: diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 617de4efb765..38d7ccf5e00c 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -884,7 +884,7 @@ main(int argc, char **argv) } 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_zoneinfo, "%s", _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, -- Herbert