d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak etcupdate(8) and mergemaster(8) after r352950

Browse Source 
r352950 introduced improper case fall-through for shell scripts. Fix it with
a pipe.

Reported by:	lwhsu, David Wolfskill
This commit is contained in:
Kyle Evans 2019-10-02 12:46:28 +00:00
parent bb2d815739
commit 0da4b4089c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=353002
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/etcupdate/etcupdate.sh
View File

@ -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

3
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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)