svn commit: r358441 - in stable: 11/usr.sbin/certctl 12/usr.sbin/certctl

[Kyle Evans]

Author: kevans
Date: Fri Feb 28 18:34:17 2020
New Revision: 358441
URL: https://svnweb.freebsd.org/changeset/base/358441

Log:
  MFC r358091: certctl(8): switch to install(1) to fix DESTDIR support
  
  "Oops" - ln(1) is fine and dandy, but when you're using DESTDIR...it's not-
  the path will almost certainly be invalid once the root you've just
  installed to is relocated, perhaps to /.
  
  Switch to install(1) using `-l rs` to calculate the relative symlink between
  the two, which should work just fine in all cases.

Modified:
  stable/11/usr.sbin/certctl/certctl.sh
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/usr.sbin/certctl/certctl.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/usr.sbin/certctl/certctl.sh
==============================================================================
--- stable/11/usr.sbin/certctl/certctl.sh	Fri Feb 28 18:32:40 2020	(r358440)
+++ stable/11/usr.sbin/certctl/certctl.sh	Fri Feb 28 18:34:17 2020	(r358441)
@@ -69,7 +69,7 @@ create_trusted_link()
 		return 1
 	fi
 	[ $VERBOSE -gt 0 ] && echo "Adding $hash.0 to trust store"
-	[ $NOOP -eq 0 ] && ln -fs $(realpath "$1") "$CERTDESTDIR/$hash.0"
+	[ $NOOP -eq 0 ] && install -lrs $(realpath "$1") "$CERTDESTDIR/$hash.0"
 }
 
 create_blacklisted()
@@ -88,7 +88,7 @@ create_blacklisted()
 		return
 	fi
 	[ $VERBOSE -gt 0 ] && echo "Adding $filename to blacklist"
-	[ $NOOP -eq 0 ] && ln -fs "$srcfile" "$BLACKLISTDESTDIR/$filename"
+	[ $NOOP -eq 0 ] && install -lrs "$srcfile" "$BLACKLISTDESTDIR/$filename"
 }
 
 do_scan()