Date: Thu, 3 Oct 2019 18:50:57 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r353061 - stable/12/sys/kern Message-ID: <201910031850.x93Iovkp099480@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Oct 3 18:50:57 2019 New Revision: 353061 URL: https://svnweb.freebsd.org/changeset/base/353061 Log: MFC r352917: Restore the ability to set capenabled directly in syscalls.conf. This fixes generation of cloudabi syscall tables broken in r340424. Reviewed by: kevans, emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D21821 Modified: stable/12/sys/kern/makesyscalls.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/makesyscalls.sh ============================================================================== --- stable/12/sys/kern/makesyscalls.sh Thu Oct 3 18:36:54 2019 (r353060) +++ stable/12/sys/kern/makesyscalls.sh Thu Oct 3 18:50:57 2019 (r353061) @@ -61,7 +61,9 @@ if [ -n "$2" ]; then . "$2" fi -if [ -r $capabilities_conf ]; then +if [ -n "$capenabled" ]; then + # do nothing +elif [ -r $capabilities_conf ]; then capenabled=`egrep -v '^#|^$' $capabilities_conf` capenabled=`echo $capenabled | sed 's/ /,/g'` else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910031850.x93Iovkp099480>