From 317111316dd38bdd89db51454e453c49232555f7 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 3 Apr 2020 15:47:15 +0000 Subject: [PATCH] Install a kyua.conf based on the one in devel/kyua. The kyua.conf from examples doesn't match the expected config and contains a lot of undesirable entries such as setting the architecture to amd64 explicitly. Reported by: arichardson (missing config) Reviewed by: emaste Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D24267 --- usr.bin/kyua/Makefile | 5 ++++- usr.bin/kyua/kyua.conf-default | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 usr.bin/kyua/kyua.conf-default diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 3ec4d4f86a33..a6401e1220a3 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -30,8 +30,11 @@ CFLAGS+= -Wno-deprecated-declarations FILESGROUPS= DOCS EXAMPLES MISC STORE -CONFS= kyua.conf +# Install a minimal default config that uses the 'tests' user. +# The examples config is not appropriate for general use. +CONFS= kyua.conf-default CONFSDIR= ${KYUA_CONFDIR} +CONFSNAME= kyua.conf DOCS= AUTHORS CONTRIBUTORS LICENSE DOCSDIR= ${KYUA_DOCDIR} diff --git a/usr.bin/kyua/kyua.conf-default b/usr.bin/kyua/kyua.conf-default new file mode 100644 index 000000000000..9c1e8286eb53 --- /dev/null +++ b/usr.bin/kyua/kyua.conf-default @@ -0,0 +1,14 @@ +-- $FreeBSD$ +-- +-- System-wide configuration file for kyua(1). See kyua.conf(5) for details +-- on the syntax. +-- + +syntax(2) + +-- User to drop privileges to when invoking kyua(1) as root and a test case +-- requests to be run with non-root permissions. +unprivileged_user = 'tests' + +-- An example to set a configuration property specific to FreeBSD. +--test_suites.FreeBSD.fstype = 'ffs'