The branch main has been updated by des:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3fed4f0db53a66a0135bea5c491431eb3348cf51

commit 3fed4f0db53a66a0135bea5c491431eb3348cf51
Author:     Mark Peek <[email protected]>
AuthorDate: 2024-03-25 15:58:46 +0000
Commit:     Dag-Erling Smørgrav <[email protected]>
CommitDate: 2024-03-25 15:59:02 +0000

    certctl: Revert to symlinks.
    
    Unfortunately tar will not be able to extract base.txz to a system where
    /etc and /usr are not on the same filesystem if the certificates are
    hard links.
    
    PR:             277828
    Reviewed by:    mp
    Differential Revision:  https://reviews.freebsd.org/D44496
---
 usr.sbin/certctl/certctl.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index 997a7d835d53..f95b4561d852 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -110,7 +110,7 @@ create_trusted()
 {
        local hash certhash otherfile otherhash
        local suffix
-       local link=${2:+-lm}
+       local link=${2:+-lrs}
 
        hash=$(do_hash "$1") || return
        certhash=$(openssl x509 -sha1 -in "$1" -noout -fingerprint)
@@ -159,7 +159,7 @@ resolve_certname()
 create_untrusted()
 {
        local srcfile filename
-       local link=${2:+-lm}
+       local link=${2:+-lrs}
 
        set -- $(resolve_certname "$1")
        srcfile=$1

Reply via email to