Module Name: src
Committed By: jmmv
Date: Sun Feb 24 03:06:16 UTC 2013
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/etc: mi
src/etc: Makefile
src/etc/mtree: NetBSD.dist.base
src/external/bsd/kyua-cli: Makefile
Added Files:
src/external/bsd/kyua-cli/etc: Makefile Makefile.inc
src/external/bsd/kyua-cli/etc/kyua: Makefile kyua.conf
Log Message:
Install a kyua.conf file that sets unprivileged_user to _tests.
To generate a diff of this commit:
cvs rdiff -u -r1.1020 -r1.1021 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.228 -r1.229 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.405 -r1.406 src/etc/Makefile
cvs rdiff -u -r1.111 -r1.112 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-cli/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/etc/Makefile \
src/external/bsd/kyua-cli/etc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/etc/kyua/Makefile \
src/external/bsd/kyua-cli/etc/kyua/kyua.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1020 src/distrib/sets/lists/base/mi:1.1021
--- src/distrib/sets/lists/base/mi:1.1020 Sat Feb 23 14:18:37 2013
+++ src/distrib/sets/lists/base/mi Sun Feb 24 03:06:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1020 2013/02/23 14:18:37 jmmv Exp $
+# $NetBSD: mi,v 1.1021 2013/02/24 03:06:14 jmmv Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -99,6 +99,7 @@
./etc/iscsi base-sysutil-root
./etc/kerberosIV base-obsolete obsolete
./etc/kerberosV base-krb5-root
+./etc/kyua base-kyua-root
./etc/mail base-postfix-bin
./etc/mtree base-sys-root
./etc/mtree/set.base base-sys-root
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.228 src/distrib/sets/lists/etc/mi:1.229
--- src/distrib/sets/lists/etc/mi:1.228 Tue Feb 7 19:13:28 2012
+++ src/distrib/sets/lists/etc/mi Sun Feb 24 03:06:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.228 2012/02/07 19:13:28 joerg Exp $
+# $NetBSD: mi,v 1.229 2013/02/24 03:06:15 jmmv Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -73,6 +73,7 @@
./etc/inetd.conf etc-netutil-etc
./etc/iscsi/auths etc-iscsi-etc iscsi
./etc/iscsi/targets etc-iscsi-etc iscsi
+./etc/kyua/kyua.conf etc-kyua-etc kyua
./etc/lkm.conf etc-obsolete obsolete
./etc/localtime etc-sys-etc
./etc/locate.conf etc-sys-etc
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.405 src/etc/Makefile:1.406
--- src/etc/Makefile:1.405 Tue Feb 5 16:39:26 2013
+++ src/etc/Makefile Sun Feb 24 03:06:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.405 2013/02/05 16:39:26 matt Exp $
+# $NetBSD: Makefile,v 1.406 2013/02/24 03:06:13 jmmv Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -335,6 +335,9 @@ install-etc-files: .PHONY .MAKE check_DE
.if (${MKATF} != "no")
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/atf/etc/atf configinstall
.endif
+.if (${MKKYUA} != "no")
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/kyua-cli/etc/kyua configinstall
+.endif
# install-obsolete-lists --
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.111 src/etc/mtree/NetBSD.dist.base:1.112
--- src/etc/mtree/NetBSD.dist.base:1.111 Sat Feb 23 14:58:12 2013
+++ src/etc/mtree/NetBSD.dist.base Sun Feb 24 03:06:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.111 2013/02/23 14:58:12 jmmv Exp $
+# $NetBSD: NetBSD.dist.base,v 1.112 2013/02/24 03:06:13 jmmv Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -36,6 +36,7 @@
./etc/fonts/conf.avail
./etc/iscsi
./etc/kerberosV
+./etc/kyua
./etc/mail
./etc/mtree
./etc/namedb
Index: src/external/bsd/kyua-cli/Makefile
diff -u src/external/bsd/kyua-cli/Makefile:1.1 src/external/bsd/kyua-cli/Makefile:1.2
--- src/external/bsd/kyua-cli/Makefile:1.1 Sat Feb 23 14:16:49 2013
+++ src/external/bsd/kyua-cli/Makefile Sun Feb 24 03:06:15 2013
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/24 03:06:15 jmmv Exp $
-SUBDIR= lib .WAIT share tests usr.bin
+SUBDIR= etc lib .WAIT share tests usr.bin
.for dir in share tests usr.bin
includes-${dir}: .PHONY
Added files:
Index: src/external/bsd/kyua-cli/etc/Makefile
diff -u /dev/null src/external/bsd/kyua-cli/etc/Makefile:1.1
--- /dev/null Sun Feb 24 03:06:16 2013
+++ src/external/bsd/kyua-cli/etc/Makefile Sun Feb 24 03:06:15 2013
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2013/02/24 03:06:15 jmmv Exp $
+
+SUBDIR= kyua
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/kyua-cli/etc/Makefile.inc
diff -u /dev/null src/external/bsd/kyua-cli/etc/Makefile.inc:1.1
--- /dev/null Sun Feb 24 03:06:16 2013
+++ src/external/bsd/kyua-cli/etc/Makefile.inc Sun Feb 24 03:06:15 2013
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/02/24 03:06:15 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/kyua-cli/etc/kyua/Makefile
diff -u /dev/null src/external/bsd/kyua-cli/etc/kyua/Makefile:1.1
--- /dev/null Sun Feb 24 03:06:16 2013
+++ src/external/bsd/kyua-cli/etc/kyua/Makefile Sun Feb 24 03:06:15 2013
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2013/02/24 03:06:15 jmmv Exp $
+
+.include <bsd.init.mk>
+
+CONFIGFILES= kyua.conf
+FILESDIR= ${KYUA_CONFDIR}
+FILESMODE= 644
+
+.include <bsd.prog.mk> # For clean and cleandir
+.include <bsd.files.mk>
Index: src/external/bsd/kyua-cli/etc/kyua/kyua.conf
diff -u /dev/null src/external/bsd/kyua-cli/etc/kyua/kyua.conf:1.1
--- /dev/null Sun Feb 24 03:06:16 2013
+++ src/external/bsd/kyua-cli/etc/kyua/kyua.conf Sun Feb 24 03:06:15 2013
@@ -0,0 +1,14 @@
+-- $NetBSD: kyua.conf,v 1.1 2013/02/24 03:06:15 jmmv Exp $
+--
+-- System-wide configuration file for kyua(1). See kyua.conf(5) for details
+-- on the syntax and tests(7) for any NetBSD-specific tweaks that may apply.
+--
+
+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 NetBSD.
+--test_suites.NetBSD.fstype = 'ffs'
