svn commit: r352917 - head/sys/kern

[Brooks Davis]

Author: brooks
Date: Mon Sep 30 20:58:29 2019
New Revision: 352917
URL: https://svnweb.freebsd.org/changeset/base/352917

Log:
  Restore the ability to set capenabled directly in syscalls.conf.
  
  This fixes generation of cloudabi syscall tables broken in r340424.
  
  Reviewed by:	kevans, emaste
  MFC after:	3 days
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D21821

Modified:
  head/sys/kern/makesyscalls.sh

Modified: head/sys/kern/makesyscalls.sh
==============================================================================
--- head/sys/kern/makesyscalls.sh	Mon Sep 30 20:39:25 2019	(r352916)
+++ head/sys/kern/makesyscalls.sh	Mon Sep 30 20:58:29 2019	(r352917)
@@ -64,7 +64,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