diff options
author | rpaulo <rpaulo@FreeBSD.org> | 2013-10-12 06:08:18 +0000 |
---|---|---|
committer | rpaulo <rpaulo@FreeBSD.org> | 2013-10-12 06:08:18 +0000 |
commit | 33f3e6ab569eb1040266c8ee7bdd0cf74bd58751 (patch) | |
tree | 539ae1a246d504ce70c2a0d4a85aaef29c1ac916 /etc | |
parent | 89a272e3b91ed0a23f538c485c1021adbfc81731 (diff) | |
download | FreeBSD-src-33f3e6ab569eb1040266c8ee7bdd0cf74bd58751.zip FreeBSD-src-33f3e6ab569eb1040266c8ee7bdd0cf74bd58751.tar.gz |
MFC 256365
Remove most of the ATF tools and the _atf user.
Approved by: re
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile | 3 | ||||
-rw-r--r-- | etc/atf/FreeBSD.conf | 12 | ||||
-rw-r--r-- | etc/atf/Makefile | 39 | ||||
-rw-r--r-- | etc/atf/common.conf | 12 | ||||
-rw-r--r-- | etc/ftpusers | 1 | ||||
-rw-r--r-- | etc/group | 1 | ||||
-rw-r--r-- | etc/master.passwd | 1 | ||||
-rw-r--r-- | etc/mtree/BSD.root.dist | 2 | ||||
-rw-r--r-- | etc/mtree/BSD.usr.dist | 10 |
9 files changed, 0 insertions, 81 deletions
diff --git a/etc/Makefile b/etc/Makefile index ff8efc5..130b168 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -215,9 +215,6 @@ distribution: echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif -.if ${MK_ATF} != "no" - ${_+_}cd ${.CURDIR}/atf; ${MAKE} install -.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif diff --git a/etc/atf/FreeBSD.conf b/etc/atf/FreeBSD.conf deleted file mode 100644 index e90a6dc..0000000 --- a/etc/atf/FreeBSD.conf +++ /dev/null @@ -1,12 +0,0 @@ -Content-Type: application/X-atf-config; version="1" - -# $FreeBSD$ -# -# Configuration file for the FreeBSD test suite. -# -# See atf-formats(5) for details on the syntax of this file and tests(7) for -# details on the FreeBSD test suite. -# - -#variable1 = value1 -#variable2 = value2 diff --git a/etc/atf/Makefile b/etc/atf/Makefile deleted file mode 100644 index 5eaa830..0000000 --- a/etc/atf/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -#- -# Copyright (c) 2011 Google, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ - -ATF= ${.CURDIR}/../../contrib/atf - -.PATH: ${ATF}/atf-run/sample - -NO_OBJ= - -FILESGROUPS= ETC - -ETCDIR= /etc/atf -ETC= FreeBSD.conf atf-run.hooks common.conf - -.include <bsd.prog.mk> diff --git a/etc/atf/common.conf b/etc/atf/common.conf deleted file mode 100644 index 392b57b..0000000 --- a/etc/atf/common.conf +++ /dev/null @@ -1,12 +0,0 @@ -Content-Type: application/X-atf-config; version="1" - -# $FreeBSD$ -# -# Sample configuration file for properties affecting all test suites. -# - -# When running the test suite as root, some tests require to switch to -# an unprivileged user to perform extra checks. Set this variable to -# the user you want to use in those cases. If not set, those tests will -# be skipped. -unprivileged-user = "_atf" diff --git a/etc/ftpusers b/etc/ftpusers index da89623..e56e44f 100644 --- a/etc/ftpusers +++ b/etc/ftpusers @@ -15,7 +15,6 @@ man sshd smmsp mailnull -_atf bind unbound proxy @@ -16,7 +16,6 @@ staff:*:20: sshd:*:22: smmsp:*:25: mailnull:*:26: -_atf:*:27: guest:*:31: bind:*:53: unbound:*:59: diff --git a/etc/master.passwd b/etc/master.passwd index 7585471..af096dd 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin -_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 352ac21..a6cba24 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -24,8 +24,6 @@ etc X11 .. - atf - .. bluetooth .. defaults diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index c06d3e1..1a8f439 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -299,8 +299,6 @@ .. IPv6 .. - atf - .. bhyve .. bootforth @@ -1410,14 +1408,6 @@ catalog .. .. - xml - atf - .. - .. - xsl - atf - .. - .. zoneinfo Africa .. |