summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xusr.sbin/etcupdate/etcupdate.sh3
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh3
2 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 1ff991d5b6c1..87d269f2ca69 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -595,8 +595,7 @@ post_install_file()
NEWALIAS_WARN=yes
fi
;;
- /usr/share/certs/trusted/*)
- /usr/share/certs/blacklisted/*)
+ /usr/share/certs/trusted/* | /usr/share/certs/blacklisted/*)
log "certctl rehash"
if [ -z "$dryrun" ]; then
env DESTDIR=${DESTDIR} certctl rehash >&3 2>&1
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index d3163fa592c8..486a957be842 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -883,8 +883,7 @@ mm_install () {
/etc/mail/aliases)
NEED_NEWALIASES=yes
;;
- /usr/share/certs/trusted/*)
- /usr/share/certs/blacklisted/*)
+ /usr/share/certs/trusted/* | /usr/share/certs/blacklisted/*)
NEED_CERTCTL=yes
;;
/etc/login.conf)