From nobody Wed Aug 27 21:36:09 2025 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 4cByWt0tbrz65hyc; Wed, 27 Aug 2025 21:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cByWt05YPz4QMm; Wed, 27 Aug 2025 21:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756330570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ItMxQrU5nlkFTKnT4imIDOV1VZfMx25BR+nKher1nz4=; b=dEq+09pQnU0Iag8/AREMdl0Q33jOoOD+WZH6A9+LsJEdjK5NGkR8qIfbym/pwejjLT5ibo 6XeCnwDEGCEWMe2IW5rRCsgOdzjYSb3yRR397qDrxlaw2NyTVoTyJPIOmY+zmLr3rXStsD gwj0Xx+5j86JY8ikWYTf/znLuPnb+byod+RVqs7td+iuyjTjUjkt/XvPkPuv4ACKpw5vDt rJ9HgAPtG0N7albP5lftk3TIJmelxjilYazn4zICEqDxIOLg43QqldPMXIMovd2YJsp0E8 qoRBtvbpWgWjFhblKP7/wTm2KmvvTb7PloK8vIcC1Qf3PZJle3Z5hsaaPFFNpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756330570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ItMxQrU5nlkFTKnT4imIDOV1VZfMx25BR+nKher1nz4=; b=cfnpQTxDNCEjOF5H9CIYyogA4SB3hC4sI4hVHhcQCH0UGGSZScQleCRXSw4T0QQNSQupk9 faqMTZACwXuIF5ypgAPcEmLQLm2J0PeN8kUBQSaEqHBk3A4Oyd1jPN6ojd2N6GaCXgYd5h cIZB0xDuQmgzc+FQiqIZLTvYdgnTjqKSA909tbeebzBwLTdmTMT4LiVSMWSGEYCPCcbtH6 q2pLHkZX02AGDQJtSgTD5mKyv4Kpq0LxyTuvU3HF2BGOCfTT7tUfDZntGCA2RU01OY83+m aJGi3Z6I4AqpO+/Q9V0YkvDXKNs5m2PPOo7KFQ1p2DM/Eitdr/z+edp13kyenw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756330570; a=rsa-sha256; cv=none; b=gTe+mHmaM+HSRlraPjQKRjhCvknI4I490b0Akv1R2R8dd7DOfoKranpYBef4OBssdw34hs 7Me/041xPzvNreVu3cfLHfM9qRY4GoPf3FHJ/YLIoBHXdPZBgwdmqE6ktyHRIjd6T1H87L UPs2IIxlG9DMjNgf/13Us8ErsP/28PhQpCOvxiWE5UeB2sSlhOtjAJHzUItb5WzAIx0lwv JuvqgcAg5xHJjO7WBvgLVoBqMW3FaWYGB6OuDVW/VkfSea00pUaa/KEC+rME5jkWyDq18T 7UTuNqH+M7mhXgwxfoucOjPnylXJF+vCN4HKnZ1+2vh831qfxyQHfvotHAp9eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cByWs6cpkzghG; Wed, 27 Aug 2025 21:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RLa9tT088602; Wed, 27 Aug 2025 21:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RLa9uW088599; Wed, 27 Aug 2025 21:36:09 GMT (envelope-from git) Date: Wed, 27 Aug 2025 21:36:09 GMT Message-Id: <202508272136.57RLa9uW088599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ccbd3de0f377 - main - bsdinstall: Copy /etc/localtime as symlink in jail script 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccbd3de0f377b62f980e205aebe0fedb5acc3415 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ccbd3de0f377b62f980e205aebe0fedb5acc3415 commit ccbd3de0f377b62f980e205aebe0fedb5acc3415 Author: Jessica Clarke AuthorDate: 2025-08-27 21:31:26 +0000 Commit: Jessica Clarke CommitDate: 2025-08-27 21:35:54 +0000 bsdinstall: Copy /etc/localtime as symlink in jail script Without -P (or -R, which defaults to enabling -P) symlinks are dereferenced and so the target file is copied, not the symlink itself. Fixes: 5e16809c953f ("tzsetup: symlink /etc/localtime instead of copying") --- usr.sbin/bsdinstall/scripts/jail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 4b2882dad477..0c3c7e125fdd 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -207,7 +207,7 @@ fi trap error SIGINT # SIGINT is bad again bsdinstall config || error "Failed to save config" cp /etc/resolv.conf $1/etc -cp /etc/localtime $1/etc +cp -P /etc/localtime $1/etc cp /var/db/zoneinfo $1/var/db # Run post-install script