ARM: MMC driver fix build lists

- Simplify build structure & Makefiles

 - Fix log system, by making sure there is only one log object per
   driver and fixed level management, to be able to set LEVEL_TRACE

 - Fixed block size support on RPI, as the MMC driver uses different
   block sizes

.gitignore

@@ -9,16 +9,15 @@ cscope.*
 *.rej
 *.[1-9].gz
 *.o
+*.elf
 *.[psS]o
 *.pico
 lib*.so*
 *.a
 *.so.*
 *.d
-!etc/*.d
 .depend
-*.gcno
+nbsdsrc/*
-*.gcda
 TAGS
 tags
 GPATH
@@ -27,10 +26,10 @@ GSYMS
 GTAGS
 \#*#
 CVS
-obj
 !/.gitignore
 .gitignore
 .svn
+minix-port.patch
 *.worldstone.log
 .worldstone*
 usr.bin/mdocml/man/*.7
@@ -41,11 +40,5 @@ releasetools/image
 releasetools/kernel
 releasetools/revision
 share/zoneinfo/builddir
-external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-no-thu
-external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-pure-v
-external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-return
-external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-this-a
-external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-vdtors
-external/bsd/llvm/dist/llvm/test/Verifier/bitcast-address-space-through-constant-inttoptr-inside-gep-i
 lib/libc/compat__*
 .gdbinit

crypto/external/bsd/libsaslc/etc/Makefile

@@ -7,7 +7,11 @@ SUBDIR=mech
 .if ${MKSHARE} != "no"
 FILESDIR=/usr/share/examples/libsaslc
 FILESOWN=root
+.if !defined(__MINIX)
 FILESGRP=wheel
+.else
+FILESGRP=operator
+.endif # !defined(__MINIX)
 FILESMODE=444
 
 FILES= saslc.conf

crypto/external/bsd/libsaslc/etc/mech/Makefile

@@ -5,7 +5,11 @@
 .if ${MKSHARE} != "no"
 FILESDIR=/usr/share/examples/libsaslc/mech
 FILESOWN=root
+.if !defined(__MINIX)
 FILESGRP=wheel
+.else
+FILESGRP=operator
+.endif # !defined(__MINIX)
 FILESMODE=444
 
 FILES=

dist/pf/sbin/pfctl/pfctl.h

@@ -1,127 +0,0 @@
-/*	$NetBSD: pfctl.h,v 1.5 2008/06/18 09:06:26 yamt Exp $	*/
-/*	$OpenBSD: pfctl.h,v 1.41 2007/05/31 04:13:37 mcbride Exp $ */
-
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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 COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- *
- */
-
-#ifndef _PFCTL_H_
-#define _PFCTL_H_
-
-enum pfctl_show { PFCTL_SHOW_RULES, PFCTL_SHOW_LABELS, PFCTL_SHOW_NOTHING };
-
-enum {	PFRB_TABLES = 1, PFRB_TSTATS, PFRB_ADDRS, PFRB_ASTATS,
-	PFRB_IFACES, PFRB_TRANS, PFRB_MAX };
-struct pfr_buffer {
-	int	 pfrb_type;	/* type of content, see enum above */
-	int	 pfrb_size;	/* number of objects in buffer */
-	int	 pfrb_msize;	/* maximum number of objects in buffer */
-	void	*pfrb_caddr;	/* malloc'ated memory area */
-};
-#define PFRB_FOREACH(var, buf)				\
-	for ((var) = pfr_buf_next((buf), NULL);		\
-	    (var) != NULL;				\
-	    (var) = pfr_buf_next((buf), (var)))
-
-void	 pfr_set_fd(int);
-int	 pfr_get_fd(void);
-int	 pfr_clr_tables(struct pfr_table *, int *, int);
-int	 pfr_add_tables(struct pfr_table *, int, int *, int);
-int	 pfr_del_tables(struct pfr_table *, int, int *, int);
-int	 pfr_get_tables(struct pfr_table *, struct pfr_table *, int *, int);
-int	 pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int);
-int	 pfr_clr_tstats(struct pfr_table *, int, int *, int);
-int	 pfr_clr_addrs(struct pfr_table *, int *, int);
-int	 pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int);
-int	 pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int);
-int	 pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int *, int *, int *, int);
-int	 pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int);
-int	 pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int);
-int	 pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int);
-int	 pfr_tst_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int);
-int	 pfr_set_tflags(struct pfr_table *, int, int, int, int *, int *, int);
-int	 pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int *, int, int);
-void	 pfr_buf_clear(struct pfr_buffer *);
-int	 pfr_buf_add(struct pfr_buffer *, const void *);
-void	*pfr_buf_next(struct pfr_buffer *, const void *);
-int	 pfr_buf_grow(struct pfr_buffer *, int);
-int	 pfr_buf_load(struct pfr_buffer *, char *, int,
-	    int (*)(struct pfr_buffer *, char *, int));
-char	*pfr_strerror(int);
-int	 pfi_get_ifaces(const char *, struct pfi_kif *, int *);
-int	 pfi_clr_istats(const char *, int *, int);
-
-void	 pfctl_print_title(char *);
-int	 pfctl_clear_tables(const char *, int);
-int	 pfctl_show_tables(const char *, int);
-int	 pfctl_command_tables(int, char *[], char *, const char *, char *,
-	    const char *, int);
-int	 pfctl_show_altq(int, const char *, int, int);
-void	 warn_namespace_collision(const char *);
-int	 pfctl_show_ifaces(const char *, int);
-FILE	*pfctl_fopen(const char *, const char *);
-
-#ifndef DEFAULT_PRIORITY
-#define DEFAULT_PRIORITY	1
-#endif
-
-#ifndef DEFAULT_QLIMIT
-#define DEFAULT_QLIMIT		50
-#endif
-
-/*
- * generalized service curve used for admission control
- */
-struct segment {
-	LIST_ENTRY(segment)	_next;
-	double			x, y, d, m;
-};
-
-extern	int loadopt;
-
-int		 check_commit_altq(int, int);
-void		 pfaltq_store(struct pf_altq *);
-struct pf_altq	*pfaltq_lookup(const char *);
-char		*rate2str(double);
-
-void	 print_addr(struct pf_addr_wrap *, sa_family_t, int);
-void	 print_host(struct pfsync_state_host *, sa_family_t, int);
-void	 print_seq(struct pfsync_state_peer *);
-void	 print_state(struct pfsync_state *, int);
-int	 unmask(struct pf_addr *, sa_family_t);
-
-int	 pfctl_cmdline_symset(char *);
-int	 pfctl_add_trans(struct pfr_buffer *, int, const char *);
-u_int32_t
-	 pfctl_get_ticket(struct pfr_buffer *, int, const char *);
-int	 pfctl_trans(int, struct pfr_buffer *, u_long, int);
-
-#endif /* _PFCTL_H_ */

dist/pf/sbin/pfctl/pfctl_parser.h

@@ -1,280 +0,0 @@
-/*	$NetBSD: pfctl_parser.h,v 1.5 2008/06/18 09:06:26 yamt Exp $	*/
-/*	$OpenBSD: pfctl_parser.h,v 1.86 2006/10/31 23:46:25 mcbride Exp $ */
-
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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 COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- *
- */
-
-#ifndef _PFCTL_PARSER_H_
-#define _PFCTL_PARSER_H_
-
-#define PF_OSFP_FILE		"/etc/pf.os"
-
-#define PF_OPT_DISABLE		0x0001
-#define PF_OPT_ENABLE		0x0002
-#define PF_OPT_VERBOSE		0x0004
-#define PF_OPT_NOACTION		0x0008
-#define PF_OPT_QUIET		0x0010
-#define PF_OPT_CLRRULECTRS	0x0020
-#define PF_OPT_USEDNS		0x0040
-#define PF_OPT_VERBOSE2		0x0080
-#define PF_OPT_DUMMYACTION	0x0100
-#define PF_OPT_DEBUG		0x0200
-#define PF_OPT_SHOWALL		0x0400
-#define PF_OPT_OPTIMIZE		0x0800
-#define PF_OPT_MERGE		0x2000
-#define PF_OPT_RECURSE		0x4000
-
-#define PF_TH_ALL		0xFF
-
-#define PF_NAT_PROXY_PORT_LOW	50001
-#define PF_NAT_PROXY_PORT_HIGH	65535
-
-#define PF_OPTIMIZE_BASIC	0x0001
-#define PF_OPTIMIZE_PROFILE	0x0002
-
-#define FCNT_NAMES { \
-	"searches", \
-	"inserts", \
-	"removals", \
-	NULL \
-}
-
-struct pfr_buffer;	/* forward definition */
-
-
-struct pfctl {
-	int dev;
-	int opts;
-	int optimize;
-	int loadopt;
-	int asd;			/* anchor stack depth */
-	int bn;				/* brace number */
-	int brace;
-	int tdirty;			/* kernel dirty */
-#define PFCTL_ANCHOR_STACK_DEPTH 64
-	struct pf_anchor *astack[PFCTL_ANCHOR_STACK_DEPTH];
-	struct pfioc_pooladdr paddr;
-	struct pfioc_altq *paltq;
-	struct pfioc_queue *pqueue;
-	struct pfr_buffer *trans;
-	struct pf_anchor *anchor, *alast;
-	const char *ruleset;
-
-	/* 'set foo' options */
-	u_int32_t	 timeout[PFTM_MAX];
-	u_int32_t	 limit[PF_LIMIT_MAX];
-	u_int32_t	 debug;
-	u_int32_t	 hostid;
-	char		*ifname;
-
-	u_int8_t	 timeout_set[PFTM_MAX];
-	u_int8_t	 limit_set[PF_LIMIT_MAX];
-	u_int8_t	 debug_set;
-	u_int8_t	 hostid_set;
-	u_int8_t	 ifname_set;
-};
-
-struct node_if {
-	char			 ifname[IFNAMSIZ];
-	u_int8_t		 not;
-	u_int8_t		 dynamic; /* antispoof */
-	u_int			 ifa_flags;
-	struct node_if		*next;
-	struct node_if		*tail;
-};
-
-struct node_host {
-	struct pf_addr_wrap	 addr;
-	struct pf_addr		 bcast;
-	struct pf_addr		 peer;
-	sa_family_t		 af;
-	u_int8_t		 not;
-	u_int32_t		 ifindex;	/* link-local IPv6 addrs */
-	char			*ifname;
-	u_int			 ifa_flags;
-	struct node_host	*next;
-	struct node_host	*tail;
-};
-
-struct node_os {
-	char			*os;
-	pf_osfp_t		 fingerprint;
-	struct node_os		*next;
-	struct node_os		*tail;
-};
-
-struct node_queue_bw {
-	u_int32_t	bw_absolute;
-	u_int16_t	bw_percent;
-};
-
-struct node_hfsc_sc {
-	struct node_queue_bw	m1;	/* slope of 1st segment; bps */
-	u_int			d;	/* x-projection of m1; msec */
-	struct node_queue_bw	m2;	/* slope of 2nd segment; bps */
-	u_int8_t		used;
-};
-
-struct node_hfsc_opts {
-	struct node_hfsc_sc	realtime;
-	struct node_hfsc_sc	linkshare;
-	struct node_hfsc_sc	upperlimit;
-	int			flags;
-};
-
-struct node_queue_opt {
-	int			 qtype;
-	union {
-		struct cbq_opts		cbq_opts;
-		struct priq_opts	priq_opts;
-		struct node_hfsc_opts	hfsc_opts;
-	}			 data;
-};
-
-SIMPLEQ_HEAD(node_tinithead, node_tinit);
-struct node_tinit {	/* table initializer */
-	SIMPLEQ_ENTRY(node_tinit)	 entries;
-	struct node_host		*host;
-	char				*file;
-};
-
-
-/* optimizer created tables */
-struct pf_opt_tbl {
-	char			 pt_name[PF_TABLE_NAME_SIZE];
-	int			 pt_rulecount;
-	int			 pt_generated;
-	struct node_tinithead	 pt_nodes;
-	struct pfr_buffer	*pt_buf;
-};
-#define PF_OPT_TABLE_PREFIX	"__automatic_"
-
-/* optimizer pf_rule container */
-struct pf_opt_rule {
-	struct pf_rule		 por_rule;
-	struct pf_opt_tbl	*por_src_tbl;
-	struct pf_opt_tbl	*por_dst_tbl;
-	u_int64_t		 por_profile_count;
-	TAILQ_ENTRY(pf_opt_rule) por_entry;
-	TAILQ_ENTRY(pf_opt_rule) por_skip_entry[PF_SKIP_COUNT];
-};
-
-TAILQ_HEAD(pf_opt_queue, pf_opt_rule);
-
-int	pfctl_rules(int, char *, FILE *, int, int, char *, struct pfr_buffer *);
-int	pfctl_optimize_ruleset(struct pfctl *, struct pf_ruleset *);
-
-int	pfctl_add_rule(struct pfctl *, struct pf_rule *, const char *);
-int	pfctl_add_altq(struct pfctl *, struct pf_altq *);
-int	pfctl_add_pool(struct pfctl *, struct pf_pool *, sa_family_t);
-void	pfctl_move_pool(struct pf_pool *, struct pf_pool *);
-void	pfctl_clear_pool(struct pf_pool *);
-
-int	pfctl_set_timeout(struct pfctl *, const char *, int, int);
-int	pfctl_set_optimization(struct pfctl *, const char *);
-int	pfctl_set_limit(struct pfctl *, const char *, unsigned int);
-int	pfctl_set_logif(struct pfctl *, char *);
-int	pfctl_set_hostid(struct pfctl *, u_int32_t);
-int	pfctl_set_debug(struct pfctl *, char *);
-int	pfctl_set_interface_flags(struct pfctl *, char *, int, int);
-
-int	parse_rules(FILE *, struct pfctl *);
-int	parse_flags(char *);
-int	pfctl_load_anchors(int, struct pfctl *, struct pfr_buffer *);
-
-void	print_pool(struct pf_pool *, u_int16_t, u_int16_t, sa_family_t, int);
-void	print_src_node(struct pf_src_node *, int);
-void	print_rule(struct pf_rule *, const char *, int);
-void	print_tabledef(const char *, int, int, struct node_tinithead *);
-void	print_status(struct pf_status *, int);
-
-int	eval_pfaltq(struct pfctl *, struct pf_altq *, struct node_queue_bw *,
-	    struct node_queue_opt *);
-int	eval_pfqueue(struct pfctl *, struct pf_altq *, struct node_queue_bw *,
-	    struct node_queue_opt *);
-
-void	 print_altq(const struct pf_altq *, unsigned, struct node_queue_bw *,
-	    struct node_queue_opt *);
-void	 print_queue(const struct pf_altq *, unsigned, struct node_queue_bw *,
-	    int, struct node_queue_opt *);
-
-int	pfctl_define_table(char *, int, int, const char *, struct pfr_buffer *,
-	    u_int32_t);
-
-void		 pfctl_clear_fingerprints(int, int);
-int		 pfctl_file_fingerprints(int, int, const char *);
-pf_osfp_t	 pfctl_get_fingerprint(const char *);
-int		 pfctl_load_fingerprints(int, int);
-char		*pfctl_lookup_fingerprint(pf_osfp_t, char *, size_t);
-void		 pfctl_show_fingerprints(int);
-
-
-struct icmptypeent {
-	const char *name;
-	u_int8_t type;
-};
-
-struct icmpcodeent {
-	const char *name;
-	u_int8_t type;
-	u_int8_t code;
-};
-
-const struct icmptypeent *geticmptypebynumber(u_int8_t, u_int8_t);
-const struct icmptypeent *geticmptypebyname(char *, u_int8_t);
-const struct icmpcodeent *geticmpcodebynumber(u_int8_t, u_int8_t, u_int8_t);
-const struct icmpcodeent *geticmpcodebyname(u_long, char *, u_int8_t);
-
-struct pf_timeout {
-	const char	*name;
-	int		 timeout;
-};
-
-#define PFCTL_FLAG_FILTER	0x02
-#define PFCTL_FLAG_NAT		0x04
-#define PFCTL_FLAG_OPTION	0x08
-#define PFCTL_FLAG_ALTQ		0x10
-#define PFCTL_FLAG_TABLE	0x20
-
-extern const struct pf_timeout pf_timeouts[];
-
-void			 set_ipmask(struct node_host *, u_int8_t);
-int			 check_netmask(struct node_host *, sa_family_t);
-int			 unmask(struct pf_addr *, sa_family_t);
-void			 ifa_load(void);
-struct node_host	*ifa_exists(const char *);
-struct node_host	*ifa_lookup(const char *, int);
-struct node_host	*host(const char *);
-
-int			 append_addr(struct pfr_buffer *, char *, int);
-int			 append_addr_host(struct pfr_buffer *,
-			    struct node_host *, int, int);
-
-#endif /* _PFCTL_PARSER_H_ */

distrib/common/parselist.awk

@@ -133,7 +133,7 @@ BEGIN \
 		print "install:"
 	} else if (mode == "mtree") {
 		print "/unset\tall";
-		print "/set\ttype=file uname=root gname=wheel";
+		print "/set\ttype=file uname=root gname=operator";
 		print;
 	} else if (mode == "populate") {
 		print "cd " ENVIRON["CURDIR"];

distrib/sets/lists/minix-base/md.evbarm

@@ -16,13 +16,18 @@
 ./etc/system.conf.d/usbd                                minix-base
 ./service/bmp085                                        minix-base
 ./service/cat24c256                                     minix-base
-./service/emmc                                          minix-base
 ./service/fb                                            minix-base
 ./service/gpio                                          minix-base
 ./service/i2c                                           minix-base
+./service/i2c_omap                                      minix-base
+./service/i2c_rpi                                       minix-base
 ./service/lan8710a                                      minix-base
-./service/mmc                                           minix-base
+./service/mailbox                                       minix-base
+./service/omap_emmc                                     minix-base
+./service/omap_mmc                                      minix-base
 ./service/random                                        minix-base
+./service/rpi_emmc                                      minix-base
+./service/rpi_mmc                                       minix-base
 ./service/sht21                                         minix-base
 ./service/tda19988                                      minix-base
 ./service/tps65217                                      minix-base

distrib/sets/lists/minix-base/md.i386

@@ -6,38 +6,29 @@
 # mv out mi
 #
 ./etc/system.conf.d/3c90x                               minix-base
-./etc/system.conf.d/als4000                             minix-base
 ./etc/system.conf.d/amddev                              minix-base
 ./etc/system.conf.d/atl2                                minix-base
-./etc/system.conf.d/cmi8738                             minix-base
-./etc/system.conf.d/cs4281                              minix-base
 ./etc/system.conf.d/dec21140A                           minix-base
 ./etc/system.conf.d/dp8390                              minix-base
 ./etc/system.conf.d/dpeth                               minix-base
-./etc/system.conf.d/e1000                               minix-base
 ./etc/system.conf.d/es1370                              minix-base
 ./etc/system.conf.d/es1371                              minix-base
+./etc/system.conf.d/e1000                               minix-base
 ./etc/system.conf.d/fxp                                 minix-base
-./etc/system.conf.d/ip1000                              minix-base
 ./etc/system.conf.d/lance                               minix-base
 ./etc/system.conf.d/printer                             minix-base
 ./etc/system.conf.d/rtl8139                             minix-base
 ./etc/system.conf.d/rtl8169                             minix-base
 ./etc/system.conf.d/ti1225                              minix-base
-./etc/system.conf.d/trident                             minix-base
 ./etc/system.conf.d/vbfs                                minix-base
 ./etc/system.conf.d/vbox                                minix-base
 ./etc/system.conf.d/virtio_net                          minix-base
-./etc/system.conf.d/vt6105                              minix-base
 ./service/3c90x                                         minix-base
 ./service/acpi                                          minix-base
 ./service/ahci                                          minix-base
-./service/als4000                                       minix-base
 ./service/amddev                                        minix-base
 ./service/at_wini                                       minix-base
 ./service/atl2                                          minix-base
-./service/cmi8738                                       minix-base
-./service/cs4281                                        minix-base
 ./service/dec21140A                                     minix-base
 ./service/dp8390                                        minix-base
 ./service/dpeth                                         minix-base
@@ -49,7 +40,6 @@
 ./service/floppy                                        minix-base
 ./service/fxp                                           minix-base
 ./service/hgfs                                          minix-base
-./service/ip1000                                        minix-base
 ./service/lance                                         minix-base
 ./service/pci                                           minix-base
 ./service/pckbd                                         minix-base
@@ -59,14 +49,10 @@
 ./service/rtl8169                                       minix-base
 ./service/sb16                                          minix-base
 ./service/ti1225                                        minix-base
-./service/trident                                       minix-base
 ./service/vbfs                                          minix-base
 ./service/vbox                                          minix-base
 ./service/virtio_blk                                    minix-base
 ./service/virtio_net                                    minix-base
-./service/vt6105                                        minix-base
-./usr/lib/libacpi.a                                     minix-base
-./usr/lib/libacpi_pic.a                                 minix-base
 ./usr/lib/libhgfs.a                                     minix-base
 ./usr/lib/libhgfs_pic.a                                 minix-base
 ./usr/lib/libm387.a                                     minix-base

distrib/sets/lists/minix-comp/md.i386

@@ -134,7 +134,7 @@
 ./usr/include/i386/ibcs2_machdep.h                      minix-comp
 ./usr/include/i386/ieee.h                               minix-comp
 ./usr/include/i386/ieeefp.h                             minix-comp
-./usr/include/i386/int86.h                              minix-comp      obsolete
+./usr/include/i386/int86.h                              minix-comp
 ./usr/include/i386/int_const.h                          minix-comp
 ./usr/include/i386/int_fmtio.h                          minix-comp
 ./usr/include/i386/int_limits.h                         minix-comp

distrib/sets/lists/minix-comp/mi

@@ -292,7 +292,7 @@
 ./usr/include/disktab.h                                 minix-comp
 ./usr/include/dlfcn.h                                   minix-comp
 ./usr/include/elf.h                                     minix-comp
-./usr/include/env.h                                     minix-comp      obsolete
+./usr/include/env.h                                     minix-comp
 ./usr/include/err.h                                     minix-comp
 ./usr/include/errno.h                                   minix-comp
 ./usr/include/eti.h                                     minix-comp
@@ -331,6 +331,7 @@
 ./usr/include/expat.h                                   minix-comp
 ./usr/include/expat_external.h                          minix-comp
 ./usr/include/fcntl.h                                   minix-comp
+./usr/include/fdt.h                                     minix-comp
 ./usr/include/fenv.h                                    minix-comp
 ./usr/include/fetch.h                                   minix-comp
 ./usr/include/float.h                                   minix-comp
@@ -1125,8 +1126,10 @@
 ./usr/include/libdde/usb_server.h                       minix-comp
 ./usr/include/libelf.h                                  minix-comp
 ./usr/include/libexec.h                                 minix-comp
+./usr/include/libfdt.h                                  minix-comp
+./usr/include/libfdt_env.h                              minix-comp
+./usr/include/libfdt_internal.h                         minix-comp
 ./usr/include/libgen.h                                  minix-comp
-./usr/include/libintl.h                                 minix-comp
 ./usr/include/libutil.h                                 minix-comp
 ./usr/include/limits.h                                  minix-comp
 ./usr/include/link.h                                    minix-comp
@@ -1182,7 +1185,6 @@
 ./usr/include/minix/blockdriver.h                       minix-comp
 ./usr/include/minix/blockdriver_mt.h                    minix-comp
 ./usr/include/minix/board.h                             minix-comp
-./usr/include/minix/bpf.h                               minix-comp
 ./usr/include/minix/btrace.h                            minix-comp
 ./usr/include/minix/callnr.h                            minix-comp
 ./usr/include/minix/chardriver.h                        minix-comp
@@ -1209,7 +1211,6 @@
 ./usr/include/minix/hgfs.h                              minix-comp
 ./usr/include/minix/i2c.h                               minix-comp
 ./usr/include/minix/i2cdriver.h                         minix-comp
-./usr/include/minix/if.h                                minix-comp
 ./usr/include/minix/input.h                             minix-comp
 ./usr/include/minix/inputdriver.h                       minix-comp
 ./usr/include/minix/ioctl.h                             minix-comp
@@ -1223,7 +1224,7 @@
 ./usr/include/minix/mmio.h                              minix-comp
 ./usr/include/minix/mthread.h                           minix-comp
 ./usr/include/minix/netdriver.h                         minix-comp
-./usr/include/minix/netsock.h                           minix-comp      obsolete
+./usr/include/minix/netsock.h                           minix-comp
 ./usr/include/minix/optset.h                            minix-comp
 ./usr/include/minix/padconf.h                           minix-comp
 ./usr/include/minix/param.h                             minix-comp
@@ -1233,15 +1234,12 @@
 ./usr/include/minix/priv.h                              minix-comp
 ./usr/include/minix/procfs.h                            minix-comp
 ./usr/include/minix/profile.h                           minix-comp
-./usr/include/minix/queryparam.h                        minix-comp      obsolete
+./usr/include/minix/queryparam.h                        minix-comp
-./usr/include/minix/rmib.h                              minix-comp
 ./usr/include/minix/rs.h                                minix-comp
 ./usr/include/minix/safecopies.h                        minix-comp
 ./usr/include/minix/sched.h                             minix-comp
 ./usr/include/minix/sef.h                               minix-comp
 ./usr/include/minix/sffs.h                              minix-comp
-./usr/include/minix/sockdriver.h                        minix-comp
-./usr/include/minix/sockevent.h                         minix-comp
 ./usr/include/minix/sound.h                             minix-comp
 ./usr/include/minix/spin.h                              minix-comp
 ./usr/include/minix/sys_config.h                        minix-comp
@@ -1276,9 +1274,6 @@
 ./usr/include/msdosfs/msdosfsmount.h                    minix-comp
 ./usr/include/ndbm.h                                    minix-comp
 ./usr/include/net                                       minix-comp
-./usr/include/net/bpf.h                                 minix-comp
-./usr/include/net/bpfdesc.h                             minix-comp
-./usr/include/net/bpfjit.h                              minix-comp
 ./usr/include/net/dlt.h                                 minix-comp
 ./usr/include/net/ethertypes.h                          minix-comp
 ./usr/include/net/gen                                   minix-comp
@@ -1316,70 +1311,24 @@
 ./usr/include/net/if_arp.h                              minix-comp
 ./usr/include/net/if_dl.h                               minix-comp
 ./usr/include/net/if_ether.h                            minix-comp
-./usr/include/net/if_ieee1394.h                         minix-comp
-./usr/include/net/if_media.h                            minix-comp
-./usr/include/net/if_pflog.h                            minix-comp
-./usr/include/net/if_types.h                            minix-comp
 ./usr/include/net/netlib.h                              minix-comp
 ./usr/include/net/pfil.h                                minix-comp
-./usr/include/net/pfkeyv2.h                             minix-comp
-./usr/include/net/pfvar.h                               minix-comp
 ./usr/include/net/radix.h                               minix-comp
 ./usr/include/net/route.h                               minix-comp
-./usr/include/net80211                                  minix-comp
-./usr/include/net80211/_ieee80211.h                     minix-comp
-./usr/include/net80211/ieee80211.h                      minix-comp
-./usr/include/net80211/ieee80211_crypto.h               minix-comp
-./usr/include/net80211/ieee80211_ioctl.h                minix-comp
-./usr/include/net80211/ieee80211_netbsd.h               minix-comp
-./usr/include/netatalk                                  minix-comp
-./usr/include/netatalk/at.h                             minix-comp
-./usr/include/netatalk/ddp_var.h                        minix-comp
 ./usr/include/netconfig.h                               minix-comp
 ./usr/include/netdb.h                                   minix-comp
 ./usr/include/netgroup.h                                minix-comp
 ./usr/include/netinet                                   minix-comp
-./usr/include/netinet/icmp6.h                           minix-comp
-./usr/include/netinet/icmp_var.h                        minix-comp
-./usr/include/netinet/if_ether.h                        minix-comp
-./usr/include/netinet/if_inarp.h                        minix-comp
-./usr/include/netinet/igmp.h                            minix-comp
-./usr/include/netinet/igmp_var.h                        minix-comp
 ./usr/include/netinet/in.h                              minix-comp
-./usr/include/netinet/in_pcb.h                          minix-comp
-./usr/include/netinet/in_pcb_hdr.h                      minix-comp
 ./usr/include/netinet/in_systm.h                        minix-comp
-./usr/include/netinet/in_var.h                          minix-comp
 ./usr/include/netinet/ip.h                              minix-comp
-./usr/include/netinet/ip6.h                             minix-comp
-./usr/include/netinet/ip_carp.h                         minix-comp
 ./usr/include/netinet/ip_icmp.h                         minix-comp
-./usr/include/netinet/ip_mroute.h                       minix-comp
 ./usr/include/netinet/ip_var.h                          minix-comp
-./usr/include/netinet/pim_var.h                         minix-comp
 ./usr/include/netinet/tcp.h                             minix-comp
-./usr/include/netinet/tcp_debug.h                       minix-comp
-./usr/include/netinet/tcp_fsm.h                         minix-comp
-./usr/include/netinet/tcp_seq.h                         minix-comp
-./usr/include/netinet/tcp_timer.h                       minix-comp
-./usr/include/netinet/tcp_var.h                         minix-comp
-./usr/include/netinet/tcp_vtw.h                         minix-comp
-./usr/include/netinet/tcpip.h                           minix-comp
 ./usr/include/netinet/udp.h                             minix-comp
 ./usr/include/netinet/udp_var.h                         minix-comp
 ./usr/include/netinet6                                  minix-comp
 ./usr/include/netinet6/in6.h                            minix-comp
-./usr/include/netinet6/in6_pcb.h                        minix-comp
-./usr/include/netinet6/in6_var.h                        minix-comp
-./usr/include/netinet6/ip6_mroute.h                     minix-comp
-./usr/include/netinet6/ip6_var.h                        minix-comp
-./usr/include/netinet6/nd6.h                            minix-comp
-./usr/include/netinet6/pim6_var.h                       minix-comp
-./usr/include/netinet6/raw_ip6.h                        minix-comp
-./usr/include/netinet6/udp6.h                           minix-comp
-./usr/include/netinet6/udp6_var.h                       minix-comp
-./usr/include/netmpls                                   minix-comp
-./usr/include/netmpls/mpls.h                            minix-comp
 ./usr/include/netpgp                                    minix-comp
 ./usr/include/netpgp.h                                  minix-comp      crypto
 ./usr/include/netpgp/verify.h                           minix-comp      crypto
@@ -1482,12 +1431,6 @@
 ./usr/include/openssl/x509_vfy.h                        minix-comp      crypto
 ./usr/include/openssl/x509v3.h                          minix-comp      crypto
 ./usr/include/paths.h                                   minix-comp
-./usr/include/pcap-namedb.h                             minix-comp
-./usr/include/pcap                                      minix-comp
-./usr/include/pcap.h                                    minix-comp
-./usr/include/pcap/bpf.h                                minix-comp
-./usr/include/pcap/namedb.h                             minix-comp
-./usr/include/pcap/pcap.h                               minix-comp
 ./usr/include/pci.h                                     minix-comp
 ./usr/include/poll.h                                    minix-comp
 ./usr/include/ppath                                     minix-comp
@@ -1510,9 +1453,6 @@
 ./usr/include/protocols/rwhod.h                         minix-comp
 ./usr/include/protocols/talkd.h                         minix-comp
 ./usr/include/protocols/timed.h                         minix-comp
-./usr/include/pthread.h                                 minix-comp
-./usr/include/pthread_queue.h                           minix-comp
-./usr/include/pthread_types.h                           minix-comp
 ./usr/include/puffs.h                                   minix-comp
 ./usr/include/pwd.h                                     minix-comp
 ./usr/include/quota.h                                   minix-comp
@@ -1800,7 +1740,6 @@
 ./usr/include/sysexits.h                                minix-comp
 ./usr/include/syslog.h                                  minix-comp
 ./usr/include/tar.h                                     minix-comp
-./usr/include/tcpd.h                                    minix-comp
 ./usr/include/term.h                                    minix-comp
 ./usr/include/termcap.h                                 minix-comp
 ./usr/include/termios.h                                 minix-comp
@@ -1881,13 +1820,11 @@
 ./usr/include/zlib.h                                    minix-comp
 ./usr/lib                                               minix-comp
 ./usr/lib/bc                                            minix-comp
-./usr/lib/bc/libacpi.a                                  minix-comp      bitcode
 ./usr/lib/bc/libarchive.a                               minix-comp      bitcode
 ./usr/lib/bc/libasyn.a                                  minix-comp      bitcode
 ./usr/lib/bc/libaudiodriver.a                           minix-comp      bitcode
 ./usr/lib/bc/libbdev.a                                  minix-comp      bitcode
 ./usr/lib/bc/libbfd.a                                   minix-comp      bitcode,binutils
-./usr/lib/bc/libbind9.a                                 minix-comp      bitcode
 ./usr/lib/bc/libblacklist.a                             minix-comp      bitcode
 ./usr/lib/bc/libblockdriver.a                           minix-comp      bitcode
 ./usr/lib/bc/libbz2.a                                   minix-comp      bitcode
@@ -1903,7 +1840,6 @@
 ./usr/lib/bc/libddekit_usb_server.a                     minix-comp      bitcode
 ./usr/lib/bc/libdes.a                                   minix-comp      bitcode
 ./usr/lib/bc/libdevman.a                                minix-comp      bitcode
-./usr/lib/bc/libdns.a                                   minix-comp      bitcode
 ./usr/lib/bc/libedit.a                                  minix-comp      bitcode
 ./usr/lib/bc/libelf.a                                   minix-comp      bitcode
 ./usr/lib/bc/libevent.a                                 minix-comp      bitcode
@@ -1918,16 +1854,10 @@
 ./usr/lib/bc/libhgfs.a                                  minix-comp      bitcode
 ./usr/lib/bc/libiberty.a                                minix-comp      bitcode,binutils
 ./usr/lib/bc/libinputdriver.a                           minix-comp      bitcode
-./usr/lib/bc/libintl.a                                  minix-comp      bitcode
-./usr/lib/bc/libirs.a                                   minix-comp      bitcode
-./usr/lib/bc/libisc.a                                   minix-comp      bitcode
-./usr/lib/bc/libisccc.a                                 minix-comp      bitcode
-./usr/lib/bc/libisccfg.a                                minix-comp      bitcode
 ./usr/lib/bc/libkvm.a                                   minix-comp      bitcode
 ./usr/lib/bc/libl.a                                     minix-comp      bitcode
 ./usr/lib/bc/liblua.a                                   minix-comp      bitcode
 ./usr/lib/bc/liblwip.a                                  minix-comp      bitcode
-./usr/lib/bc/liblwres.a                                 minix-comp      bitcode
 ./usr/lib/bc/liblzma.a                                  minix-comp      bitcode
 ./usr/lib/bc/libm.a                                     minix-comp      bitcode
 ./usr/lib/bc/libm387.a                                  minix-comp      bitcode
@@ -1941,9 +1871,8 @@
 ./usr/lib/bc/libnetdriver.a                             minix-comp      bitcode
 ./usr/lib/bc/libnetpgp.a                                minix-comp      bitcode
 ./usr/lib/bc/libnetpgpverify.a                          minix-comp      bitcode
-./usr/lib/bc/libnetsock.a                               minix-comp      bitcode,obsolete
+./usr/lib/bc/libnetsock.a                               minix-comp      bitcode
 ./usr/lib/bc/libopcodes.a                               minix-comp      bitcode,binutils
-./usr/lib/bc/libpcap.a                                  minix-comp      bitcode
 ./usr/lib/bc/libpci.a                                   minix-comp      bitcode
 ./usr/lib/bc/libprop.a                                  minix-comp      bitcode
 ./usr/lib/bc/libpuffs.a                                 minix-comp      bitcode
@@ -1951,8 +1880,6 @@
 ./usr/lib/bc/librmt.a                                   minix-comp      bitcode
 ./usr/lib/bc/libsaslc.a                                 minix-comp      bitcode
 ./usr/lib/bc/libsffs.a                                  minix-comp      bitcode
-./usr/lib/bc/libsockdriver.a                            minix-comp      bitcode
-./usr/lib/bc/libsockevent.a                             minix-comp      bitcode
 ./usr/lib/bc/libsqlite3.a                               minix-comp      bitcode
 ./usr/lib/bc/libssl.a                                   minix-comp      bitcode
 ./usr/lib/bc/libsys.a                                   minix-comp      bitcode
@@ -1964,55 +1891,7 @@
 ./usr/lib/bc/libvboxfs.a                                minix-comp      bitcode
 ./usr/lib/bc/libvirtio.a                                minix-comp      bitcode
 ./usr/lib/bc/libvtreefs.a                               minix-comp      bitcode
-./usr/lib/bc/libwrap.a                                  minix-comp      bitcode
 ./usr/lib/bc/libz.a                                     minix-comp      bitcode
-./usr/lib/i18n/bc                                       minix-comp      bitcode
-./usr/lib/i18n/bc/libBIG5.a                             minix-comp      bitcode
-./usr/lib/i18n/bc/libDECHanyu.a                         minix-comp      bitcode
-./usr/lib/i18n/bc/libEUC.a                              minix-comp      bitcode
-./usr/lib/i18n/bc/libEUCTW.a                            minix-comp      bitcode
-./usr/lib/i18n/bc/libGBK2K.a                            minix-comp      bitcode
-./usr/lib/i18n/bc/libHZ.a                               minix-comp      bitcode
-./usr/lib/i18n/bc/libISO2022.a                          minix-comp      bitcode
-./usr/lib/i18n/bc/libJOHAB.a                            minix-comp      bitcode
-./usr/lib/i18n/bc/libMSKanji.a                          minix-comp      bitcode
-./usr/lib/i18n/bc/libUES.a                              minix-comp      bitcode
-./usr/lib/i18n/bc/libUTF1632.a                          minix-comp      bitcode
-./usr/lib/i18n/bc/libUTF7.a                             minix-comp      bitcode
-./usr/lib/i18n/bc/libUTF8.a                             minix-comp      bitcode
-./usr/lib/i18n/bc/libVIQR.a                             minix-comp      bitcode
-./usr/lib/i18n/bc/libZW.a                               minix-comp      bitcode
-./usr/lib/i18n/bc/libiconv_none.a                       minix-comp      bitcode
-./usr/lib/i18n/bc/libiconv_std.a                        minix-comp      bitcode
-./usr/lib/i18n/bc/libmapper_646.a                       minix-comp      bitcode
-./usr/lib/i18n/bc/libmapper_none.a                      minix-comp      bitcode
-./usr/lib/i18n/bc/libmapper_parallel.a                  minix-comp      bitcode
-./usr/lib/i18n/bc/libmapper_serial.a                    minix-comp      bitcode
-./usr/lib/i18n/bc/libmapper_std.a                       minix-comp      bitcode
-./usr/lib/i18n/bc/libmapper_zone.a                      minix-comp      bitcode
-./usr/lib/i18n/libBIG5.a                                minix-comp
-./usr/lib/i18n/libDECHanyu.a                            minix-comp
-./usr/lib/i18n/libEUC.a                                 minix-comp
-./usr/lib/i18n/libEUCTW.a                               minix-comp
-./usr/lib/i18n/libGBK2K.a                               minix-comp
-./usr/lib/i18n/libHZ.a                                  minix-comp
-./usr/lib/i18n/libISO2022.a                             minix-comp
-./usr/lib/i18n/libJOHAB.a                               minix-comp
-./usr/lib/i18n/libMSKanji.a                             minix-comp
-./usr/lib/i18n/libUES.a                                 minix-comp
-./usr/lib/i18n/libUTF1632.a                             minix-comp
-./usr/lib/i18n/libUTF7.a                                minix-comp
-./usr/lib/i18n/libUTF8.a                                minix-comp
-./usr/lib/i18n/libVIQR.a                                minix-comp
-./usr/lib/i18n/libZW.a                                  minix-comp
-./usr/lib/i18n/libiconv_none.a                          minix-comp
-./usr/lib/i18n/libiconv_std.a                           minix-comp
-./usr/lib/i18n/libmapper_646.a                          minix-comp
-./usr/lib/i18n/libmapper_none.a                         minix-comp
-./usr/lib/i18n/libmapper_parallel.a                     minix-comp
-./usr/lib/i18n/libmapper_serial.a                       minix-comp
-./usr/lib/i18n/libmapper_std.a                          minix-comp
-./usr/lib/i18n/libmapper_zone.a                         minix-comp
 ./usr/lib/libarchive.a                                  minix-comp
 ./usr/lib/libarchive_pic.a                              minix-comp
 ./usr/lib/libasyn.a                                     minix-comp
@@ -2021,8 +1900,6 @@
 ./usr/lib/libaudiodriver_pic.a                          minix-comp
 ./usr/lib/libbdev.a                                     minix-comp
 ./usr/lib/libbdev_pic.a                                 minix-comp
-./usr/lib/libbind9.a                                    minix-comp
-./usr/lib/libbind9_pic.a                                minix-comp
 ./usr/lib/libblockdriver.a                              minix-comp
 ./usr/lib/libblockdriver_pic.a                          minix-comp
 ./usr/lib/libbz2.a                                      minix-comp
@@ -2047,19 +1924,12 @@
 ./usr/lib/libddekit_usb_server_pic.a                    minix-comp
 ./usr/lib/libdevman.a                                   minix-comp
 ./usr/lib/libdevman_pic.a                               minix-comp
-./usr/lib/libdns.a                                      minix-comp
-./usr/lib/libdns_pic.a                                  minix-comp
 ./usr/lib/libedit.a                                     minix-comp
 ./usr/lib/libedit_pic.a                                 minix-comp
 ./usr/lib/libelf.a                                      minix-comp
 ./usr/lib/libelf_pic.a                                  minix-comp
 ./usr/lib/libevent.a                                    minix-comp
 ./usr/lib/libevent_pic.a                                minix-comp
-./usr/lib/libevent_pthreads.a                           minix-comp
-./usr/lib/libevent_pthreads.so                          minix-comp
-./usr/lib/libevent_pthreads.so.4                        minix-comp
-./usr/lib/libevent_pthreads.so.4.0                      minix-comp
-./usr/lib/libevent_pthreads_pic.a                       minix-comp
 ./usr/lib/libexec.a                                     minix-comp
 ./usr/lib/libexec_pic.a                                 minix-comp
 ./usr/lib/libexecinfo.a                                 minix-comp
@@ -2080,16 +1950,6 @@
 ./usr/lib/libgcov.a                                     minix-comp      gcc=45,!gcccmds
 ./usr/lib/libinputdriver.a                              minix-comp
 ./usr/lib/libinputdriver_pic.a                          minix-comp
-./usr/lib/libintl.a                                     minix-comp
-./usr/lib/libintl_pic.a                                 minix-comp
-./usr/lib/libirs.a                                      minix-comp
-./usr/lib/libirs_pic.a                                  minix-comp
-./usr/lib/libisc.a                                      minix-comp
-./usr/lib/libisc_pic.a                                  minix-comp
-./usr/lib/libisccc.a                                    minix-comp
-./usr/lib/libisccc_pic.a                                minix-comp
-./usr/lib/libisccfg.a                                   minix-comp
-./usr/lib/libisccfg_pic.a                               minix-comp
 ./usr/lib/libkvm.a                                      minix-comp
 ./usr/lib/libkvm_pic.a                                  minix-comp
 ./usr/lib/libl.a                                        minix-comp
@@ -2097,8 +1957,6 @@
 ./usr/lib/liblua_pic.a                                  minix-comp
 ./usr/lib/liblwip.a                                     minix-comp
 ./usr/lib/liblwip_pic.a                                 minix-comp
-./usr/lib/liblwres.a                                    minix-comp
-./usr/lib/liblwres_pic.a                                minix-comp
 ./usr/lib/liblzma.a                                     minix-comp
 ./usr/lib/liblzma_pic.a                                 minix-comp
 ./usr/lib/libm.a                                        minix-comp
@@ -2117,21 +1975,14 @@
 ./usr/lib/libmthread_pic.a                              minix-comp
 ./usr/lib/libnetdriver.a                                minix-comp
 ./usr/lib/libnetdriver_pic.a                            minix-comp
-./usr/lib/libnetsock.a                                  minix-comp      obsolete
+./usr/lib/libnetsock.a                                  minix-comp
-./usr/lib/libnetsock_pic.a                              minix-comp      obsolete
+./usr/lib/libnetsock_pic.a                              minix-comp
 ./usr/lib/libobjc.a                                     minix-comp      gcc=45
 ./usr/lib/libobjc_pic.a                                 minix-comp      gcc=45
-./usr/lib/libpcap.a                                     minix-comp
-./usr/lib/libpcap_pic.a                                 minix-comp
 ./usr/lib/libpci.a                                      minix-comp
 ./usr/lib/libpci_pic.a                                  minix-comp
 ./usr/lib/libprop.a                                     minix-comp
 ./usr/lib/libprop_pic.a                                 minix-comp
-./usr/lib/libpthread.a                                  minix-comp
-./usr/lib/libpthread.so                                 minix-comp
-./usr/lib/libpthread.so.1                               minix-comp
-./usr/lib/libpthread.so.1.2                             minix-comp
-./usr/lib/libpthread_pic.a                              minix-comp
 ./usr/lib/libpuffs.a                                    minix-comp
 ./usr/lib/libpuffs_pic.a                                minix-comp
 ./usr/lib/librefuse.a                                   minix-comp
@@ -2139,10 +1990,6 @@
 ./usr/lib/librmt.a                                      minix-comp
 ./usr/lib/libsffs.a                                     minix-comp
 ./usr/lib/libsffs_pic.a                                 minix-comp
-./usr/lib/libsockdriver.a                               minix-comp
-./usr/lib/libsockdriver_pic.a                           minix-comp
-./usr/lib/libsockevent.a                                minix-comp
-./usr/lib/libsockevent_pic.a                            minix-comp
 ./usr/lib/libsqlite3.a                                  minix-comp
 ./usr/lib/libsqlite3_pic.a                              minix-comp
 ./usr/lib/libstdc++.a                                   minix-comp      libstdcxx
@@ -2164,8 +2011,6 @@
 ./usr/lib/libutil_pic.a                                 minix-comp
 ./usr/lib/libvtreefs.a                                  minix-comp
 ./usr/lib/libvtreefs_pic.a                              minix-comp
-./usr/lib/libwrap.a                                     minix-comp
-./usr/lib/libwrap_pic.a                                 minix-comp
 ./usr/lib/libz.a                                        minix-comp
 ./usr/lib/libz_pic.a                                    minix-comp
 ./usr/libexec/cc1                                       minix-comp      gcccmds

distrib/sets/lists/minix-debug/md.evbarm

@@ -1,25 +0,0 @@
-#
-# Sorted using sort_set.pl in releasetools.
-# to add an entry simply add it at the end of the
-# file and run
-# ../../../../releasetools/sort_set.pl < mi > out
-# mv out mi
-#
-./usr/lib/libclkconf_g.a                                minix-debug     debuglib
-./usr/lib/libgpio_g.a                                   minix-debug     debuglib
-./usr/lib/libi2cdriver_g.a                              minix-debug     debuglib
-./usr/libdata/debug/service/bmp085.debug                minix-debug     debug
-./usr/libdata/debug/service/cat24c256.debug             minix-debug     debug
-./usr/libdata/debug/service/emmc.debug                  minix-debug     debug
-./usr/libdata/debug/service/fb.debug                    minix-debug     debug
-./usr/libdata/debug/service/gpio.debug                  minix-debug     debug
-./usr/libdata/debug/service/i2c.debug                   minix-debug     debug
-./usr/libdata/debug/service/lan8710a.debug              minix-debug     debug
-./usr/libdata/debug/service/mmc.debug                   minix-debug     debug
-./usr/libdata/debug/service/sht21.debug                 minix-debug     debug
-./usr/libdata/debug/service/tda19988.debug              minix-debug     debug
-./usr/libdata/debug/service/tps65217.debug              minix-debug     debug
-./usr/libdata/debug/service/tps65950.debug              minix-debug     debug
-./usr/libdata/debug/service/tsl2550.debug               minix-debug     debug
-./usr/libdata/debug/service/usbd.debug                  minix-debug     debug
-./usr/libdata/debug/usr/bin/eepromread.debug            minix-debug     debug

distrib/sets/lists/minix-debug/md.i386

@@ -1,52 +0,0 @@
-#
-# Sorted using sort_set.pl in releasetools.
-# to add an entry simply add it at the end of the
-# file and run
-# ../../../../releasetools/sort_set.pl < mi > out
-# mv out mi
-#
-./usr/lib/libhgfs_g.a                                   minix-debug     debuglib
-./usr/lib/libm387_g.a                                   minix-debug     debuglib
-./usr/lib/libvassert_g.a                                minix-debug     debuglib
-./usr/lib/libvboxfs_g.a                                 minix-debug     debuglib
-./usr/lib/libvirtio_g.a                                 minix-debug     debuglib
-./usr/libdata/debug/service/3c90x.debug                 minix-debug     debug
-./usr/libdata/debug/service/acpi.debug                  minix-debug     debug
-./usr/libdata/debug/service/ahci.debug                  minix-debug     debug
-./usr/libdata/debug/service/als4000.debug               minix-debug     debug
-./usr/libdata/debug/service/amddev.debug                minix-debug     debug
-./usr/libdata/debug/service/at_wini.debug               minix-debug     debug
-./usr/libdata/debug/service/atl2.debug                  minix-debug     debug
-./usr/libdata/debug/service/cmi8738.debug               minix-debug     debug
-./usr/libdata/debug/service/cs4281.debug                minix-debug     debug
-./usr/libdata/debug/service/dec21140A.debug             minix-debug     debug
-./usr/libdata/debug/service/dp8390.debug                minix-debug     debug
-./usr/libdata/debug/service/dpeth.debug                 minix-debug     debug
-./usr/libdata/debug/service/e1000.debug                 minix-debug     debug
-./usr/libdata/debug/service/es1370.debug                minix-debug     debug
-./usr/libdata/debug/service/es1371.debug                minix-debug     debug
-./usr/libdata/debug/service/fbd.debug                   minix-debug     debug
-./usr/libdata/debug/service/filter.debug                minix-debug     debug
-./usr/libdata/debug/service/floppy.debug                minix-debug     debug
-./usr/libdata/debug/service/fxp.debug                   minix-debug     debug
-./usr/libdata/debug/service/hgfs.debug                  minix-debug     debug
-./usr/libdata/debug/service/ip1000.debug                minix-debug     debug
-./usr/libdata/debug/service/lance.debug                 minix-debug     debug
-./usr/libdata/debug/service/pci.debug                   minix-debug     debug
-./usr/libdata/debug/service/pckbd.debug                 minix-debug     debug
-./usr/libdata/debug/service/printer.debug               minix-debug     debug
-./usr/libdata/debug/service/rtl8139.debug               minix-debug     debug
-./usr/libdata/debug/service/rtl8169.debug               minix-debug     debug
-./usr/libdata/debug/service/sb16.debug                  minix-debug     debug
-./usr/libdata/debug/service/ti1225.debug                minix-debug     debug
-./usr/libdata/debug/service/trident.debug               minix-debug     debug
-./usr/libdata/debug/service/vbfs.debug                  minix-debug     debug
-./usr/libdata/debug/service/vbox.debug                  minix-debug     debug
-./usr/libdata/debug/service/virtio_blk.debug            minix-debug     debug
-./usr/libdata/debug/service/virtio_net.debug            minix-debug     debug
-./usr/libdata/debug/service/vt6105.debug                minix-debug     debug
-./usr/libdata/debug/usr/lib/libm387.so.0.1.debug        minix-debug     debug
-./usr/libdata/debug/usr/tests/minix-posix/test47.debug  minix-debug     debug
-./usr/libdata/debug/usr/tests/minix-posix/test51.debug  minix-debug     debug
-./usr/libdata/debug/usr/tests/minix-posix/test57.debug  minix-debug     debug
-./usr/libdata/debug/usr/tests/minix-posix/test62.debug  minix-debug     debug

distrib/sets/lists/minix-man/mi

@@ -18,7 +18,6 @@
 ./usr/man/man1/alias.1                                  minix-man
 ./usr/man/man1/apropos.1                                minix-man
 ./usr/man/man1/ar.1                                     minix-man       binutils
-./usr/man/man1/arpaname.1                               minix-man
 ./usr/man/man1/as.1                                     minix-man       binutils
 ./usr/man/man1/asa.1                                    minix-man
 ./usr/man/man1/ash.1                                    minix-man       obsolete
@@ -79,12 +78,10 @@
 ./usr/man/man1/date.1                                   minix-man
 ./usr/man/man1/dd.1                                     minix-man
 ./usr/man/man1/decomp16.1                               minix-man       obsolete
-./usr/man/man1/delv.1                                   minix-man
 ./usr/man/man1/deroff.1                                 minix-man
 ./usr/man/man1/df.1                                     minix-man
 ./usr/man/man1/dhrystone.1                              minix-man
 ./usr/man/man1/diff.1                                   minix-man
-./usr/man/man1/dig.1                                    minix-man
 ./usr/man/man1/dirname.1                                minix-man
 ./usr/man/man1/dirs.1                                   minix-man
 ./usr/man/man1/domainname.1                             minix-man
@@ -115,7 +112,6 @@
 ./usr/man/man1/flex.1                                   minix-man
 ./usr/man/man1/flexdoc.1                                minix-man       obsolete
 ./usr/man/man1/flock.1                                  minix-man
-./usr/man/man1/fmt.1                                    minix-man
 ./usr/man/man1/fold.1                                   minix-man
 ./usr/man/man1/for.1                                    minix-man       obsolete
 ./usr/man/man1/foreach.1                                minix-man
@@ -126,9 +122,6 @@
 ./usr/man/man1/fsplit.1                                 minix-man
 ./usr/man/man1/ftp.1                                    minix-man
 ./usr/man/man1/genassym.1                               minix-man
-./usr/man/man1/gencat.1                                 minix-man
-./usr/man/man1/getcap.1                                 minix-man
-./usr/man/man1/getent.1                                 minix-man
 ./usr/man/man1/getopt.1                                 minix-man
 ./usr/man/man1/getopts.1                                minix-man       obsolete
 ./usr/man/man1/gprof.1                                  minix-man       binutils
@@ -143,7 +136,7 @@
 ./usr/man/man1/hexdump.1                                minix-man
 ./usr/man/man1/history.1                                minix-man
 ./usr/man/man1/host.1                                   minix-man
-./usr/man/man1/hostaddr.1                               minix-man       obsolete
+./usr/man/man1/hostaddr.1                               minix-man
 ./usr/man/man1/hostname.1                               minix-man
 ./usr/man/man1/id.1                                     minix-man
 ./usr/man/man1/if.1                                     minix-man       obsolete
@@ -194,7 +187,6 @@
 ./usr/man/man1/loadfont.1                               minix-man
 ./usr/man/man1/loadkeys.1                               minix-man
 ./usr/man/man1/local.1                                  minix-man       obsolete
-./usr/man/man1/locale.1                                 minix-man
 ./usr/man/man1/lock.1                                   minix-man
 ./usr/man/man1/logger.1                                 minix-man
 ./usr/man/man1/login.1                                  minix-man
@@ -228,7 +220,6 @@
 ./usr/man/man1/mkdir.1                                  minix-man
 ./usr/man/man1/mkfifo.1                                 minix-man
 ./usr/man/man1/mkfs.mfs.1                               minix-man
-./usr/man/man1/mklocale.1                               minix-man
 ./usr/man/man1/mkproto.1                                minix-man
 ./usr/man/man1/mkstr.1                                  minix-man
 ./usr/man/man1/mktemp.1                                 minix-man
@@ -241,18 +232,15 @@
 ./usr/man/man1/netpgp.1                                 minix-man       crypto
 ./usr/man/man1/netpgpkeys.1                             minix-man       crypto
 ./usr/man/man1/netpgpverify.1                           minix-man       crypto
-./usr/man/man1/netstat.1                                minix-man
 ./usr/man/man1/newfs_mfs.1                              minix-man
 ./usr/man/man1/newgrp.1                                 minix-man
 ./usr/man/man1/nice.1                                   minix-man
 ./usr/man/man1/nl.1                                     minix-man
 ./usr/man/man1/nm.1                                     minix-man       binutils
 ./usr/man/man1/nohup.1                                  minix-man
-./usr/man/man1/nsupdate.1                               minix-man
 ./usr/man/man1/objcopy.1                                minix-man       binutils
 ./usr/man/man1/objdump.1                                minix-man       binutils
 ./usr/man/man1/od.1                                     minix-man
-./usr/man/man1/omshell.1                                minix-man
 ./usr/man/man1/openssl.1                                minix-man       crypto
 ./usr/man/man1/openssl_CA.pl.1                          minix-man       crypto
 ./usr/man/man1/openssl_asn1parse.1                      minix-man       crypto
@@ -298,7 +286,6 @@
 ./usr/man/man1/patch.1                                  minix-man
 ./usr/man/man1/pathchk.1                                minix-man
 ./usr/man/man1/pax.1                                    minix-man
-./usr/man/man1/pcap-config.1                            minix-man
 ./usr/man/man1/ping.1                                   minix-man       obsolete
 ./usr/man/man1/pkg_add.1                                minix-man       crypto
 ./usr/man/man1/pkg_admin.1                              minix-man       crypto
@@ -330,8 +317,8 @@
 ./usr/man/man1/repeat.1                                 minix-man
 ./usr/man/man1/return.1                                 minix-man       obsolete
 ./usr/man/man1/rev.1                                    minix-man
-./usr/man/man1/rget.1                                   minix-man       obsolete
+./usr/man/man1/rget.1                                   minix-man
-./usr/man/man1/rlogin.1                                 minix-man       obsolete
+./usr/man/man1/rlogin.1                                 minix-man
 ./usr/man/man1/rm.1                                     minix-man
 ./usr/man/man1/rmd160.1                                 minix-man
 ./usr/man/man1/rmdir.1                                  minix-man
@@ -483,8 +470,8 @@
 ./usr/man/man2/fstatvfs1.2                              minix-man
 ./usr/man/man2/getgid.2                                 minix-man
 ./usr/man/man2/getitimer.2                              minix-man
-./usr/man/man2/getnucred.2                              minix-man       obsolete
+./usr/man/man2/getnucred.2                              minix-man
-./usr/man/man2/getpeereid.2                             minix-man       obsolete
+./usr/man/man2/getpeereid.2                             minix-man
 ./usr/man/man2/getpeername.2                            minix-man
 ./usr/man/man2/getpid.2                                 minix-man
 ./usr/man/man2/getpriority.2                            minix-man
@@ -836,7 +823,6 @@
 ./usr/man/man3/addnstr.3                                minix-man
 ./usr/man/man3/addr.3                                   minix-man
 ./usr/man/man3/addstr.3                                 minix-man
-./usr/man/man3/affinity.3                               minix-man
 ./usr/man/man3/alarm.3                                  minix-man
 ./usr/man/man3/alloca.3                                 minix-man
 ./usr/man/man3/allocaddrinfo.3                          minix-man
@@ -1126,8 +1112,6 @@
 ./usr/man/man3/bcmp.3                                   minix-man
 ./usr/man/man3/bcopy.3                                  minix-man
 ./usr/man/man3/beep.3                                   minix-man
-./usr/man/man3/bind_textdomain_codeset.3                minix-man
-./usr/man/man3/bindtextdomain.3                         minix-man
 ./usr/man/man3/bkgd.3                                   minix-man
 ./usr/man/man3/bkgdset.3                                minix-man
 ./usr/man/man3/blacklist.3                              minix-man
@@ -1367,8 +1351,6 @@
 ./usr/man/man3/dbm_open.3                               minix-man
 ./usr/man/man3/dbm_store.3                              minix-man
 ./usr/man/man3/dbopen.3                                 minix-man
-./usr/man/man3/dcgettext.3                              minix-man
-./usr/man/man3/dcngettext.3                             minix-man
 ./usr/man/man3/def_prog_mode.3                          minix-man
 ./usr/man/man3/def_shell_mode.3                         minix-man
 ./usr/man/man3/define_key.3                             minix-man
@@ -1417,7 +1399,6 @@
 ./usr/man/man3/des_string_to_key.3                      minix-man       crypto
 ./usr/man/man3/des_xcbc_encrypt.3                       minix-man       crypto
 ./usr/man/man3/devname.3                                minix-man
-./usr/man/man3/dgettext.3                               minix-man
 ./usr/man/man3/difftime.3                               minix-man
 ./usr/man/man3/directory.3                              minix-man
 ./usr/man/man3/dirfd.3                                  minix-man
@@ -1425,7 +1406,6 @@
 ./usr/man/man3/div.3                                    minix-man
 ./usr/man/man3/dn_comp.3                                minix-man
 ./usr/man/man3/dn_expand.3                              minix-man
-./usr/man/man3/dngettext.3                              minix-man
 ./usr/man/man3/doupdate.3                               minix-man
 ./usr/man/man3/dprintf.3                                minix-man
 ./usr/man/man3/drand48.3                                minix-man
@@ -1886,7 +1866,6 @@
 ./usr/man/man3/getservent.3                             minix-man
 ./usr/man/man3/getstr.3                                 minix-man
 ./usr/man/man3/getsubopt.3                              minix-man
-./usr/man/man3/gettext.3                                minix-man
 ./usr/man/man3/gettmode.3                               minix-man
 ./usr/man/man3/getttyent.3                              minix-man
 ./usr/man/man3/getttynam.3                              minix-man
@@ -1928,8 +1907,6 @@
 ./usr/man/man3/history_init.3                           minix-man
 ./usr/man/man3/hline.3                                  minix-man
 ./usr/man/man3/hostalias.3                              minix-man
-./usr/man/man3/hosts_access.3                           minix-man
-./usr/man/man3/hosts_ctl.3                              minix-man
 ./usr/man/man3/hsearch.3                                minix-man
 ./usr/man/man3/hsearch_r.3                              minix-man
 ./usr/man/man3/hstrerror.3                              minix-man
@@ -2323,7 +2300,6 @@
 ./usr/man/man3/nexttoward.3                             minix-man
 ./usr/man/man3/nexttowardf.3                            minix-man
 ./usr/man/man3/nftw.3                                   minix-man
-./usr/man/man3/ngettext.3                               minix-man
 ./usr/man/man3/nice.3                                   minix-man
 ./usr/man/man3/nl.3                                     minix-man
 ./usr/man/man3/nl_langinfo.3                            minix-man
@@ -2384,61 +2360,6 @@
 ./usr/man/man3/pair_content.3                           minix-man
 ./usr/man/man3/parsedate.3                              minix-man
 ./usr/man/man3/pause.3                                  minix-man
-./usr/man/man3/pcap.3                                   minix-man
-./usr/man/man3/pcap_activate.3                          minix-man
-./usr/man/man3/pcap_breakloop.3                         minix-man
-./usr/man/man3/pcap_can_set_rfmon.3                     minix-man
-./usr/man/man3/pcap_close.3                             minix-man
-./usr/man/man3/pcap_compile.3                           minix-man
-./usr/man/man3/pcap_create.3                            minix-man
-./usr/man/man3/pcap_datalink.3                          minix-man
-./usr/man/man3/pcap_datalink_name_to_val.3              minix-man
-./usr/man/man3/pcap_datalink_val_to_name.3              minix-man
-./usr/man/man3/pcap_dump.3                              minix-man
-./usr/man/man3/pcap_dump_close.3                        minix-man
-./usr/man/man3/pcap_dump_file.3                         minix-man
-./usr/man/man3/pcap_dump_flush.3                        minix-man
-./usr/man/man3/pcap_dump_ftell.3                        minix-man
-./usr/man/man3/pcap_dump_open.3                         minix-man
-./usr/man/man3/pcap_file.3                              minix-man
-./usr/man/man3/pcap_fileno.3                            minix-man
-./usr/man/man3/pcap_findalldevs.3                       minix-man
-./usr/man/man3/pcap_freecode.3                          minix-man
-./usr/man/man3/pcap_get_selectable_fd.3                 minix-man
-./usr/man/man3/pcap_get_tstamp_precision.3              minix-man
-./usr/man/man3/pcap_geterr.3                            minix-man
-./usr/man/man3/pcap_inject.3                            minix-man
-./usr/man/man3/pcap_is_swapped.3                        minix-man
-./usr/man/man3/pcap_lib_version.3                       minix-man
-./usr/man/man3/pcap_list_datalinks.3                    minix-man
-./usr/man/man3/pcap_list_tstamp_types.3                 minix-man
-./usr/man/man3/pcap_lookupdev.3                         minix-man
-./usr/man/man3/pcap_lookupnet.3                         minix-man
-./usr/man/man3/pcap_loop.3                              minix-man
-./usr/man/man3/pcap_major_version.3                     minix-man
-./usr/man/man3/pcap_next_ex.3                           minix-man
-./usr/man/man3/pcap_offline_filter.3                    minix-man
-./usr/man/man3/pcap_open_dead.3                         minix-man
-./usr/man/man3/pcap_open_live.3                         minix-man
-./usr/man/man3/pcap_open_offline.3                      minix-man
-./usr/man/man3/pcap_set_buffer_size.3                   minix-man
-./usr/man/man3/pcap_set_datalink.3                      minix-man
-./usr/man/man3/pcap_set_immediate_mode.3                minix-man
-./usr/man/man3/pcap_set_promisc.3                       minix-man
-./usr/man/man3/pcap_set_rfmon.3                         minix-man
-./usr/man/man3/pcap_set_snaplen.3                       minix-man
-./usr/man/man3/pcap_set_timeout.3                       minix-man
-./usr/man/man3/pcap_set_tstamp_precision.3              minix-man
-./usr/man/man3/pcap_set_tstamp_type.3                   minix-man
-./usr/man/man3/pcap_setdirection.3                      minix-man
-./usr/man/man3/pcap_setfilter.3                         minix-man
-./usr/man/man3/pcap_setnonblock.3                       minix-man
-./usr/man/man3/pcap_snapshot.3                          minix-man
-./usr/man/man3/pcap_stats.3                             minix-man
-./usr/man/man3/pcap_statustostr.3                       minix-man
-./usr/man/man3/pcap_strerror.3                          minix-man
-./usr/man/man3/pcap_tstamp_type_name_to_val.3           minix-man
-./usr/man/man3/pcap_tstamp_type_val_to_name.3           minix-man
 ./usr/man/man3/pci.3                                    minix-man
 ./usr/man/man3/pci_conf_print.3                         minix-man
 ./usr/man/man3/pci_devinfo.3                            minix-man
@@ -2658,111 +2579,7 @@
 ./usr/man/man3/proplib.3                                minix-man
 ./usr/man/man3/psiginfo.3                               minix-man
 ./usr/man/man3/psignal.3                                minix-man
-./usr/man/man3/pthread.3                                minix-man
 ./usr/man/man3/pthread_atfork.3                         minix-man
-./usr/man/man3/pthread_attr.3                           minix-man
-./usr/man/man3/pthread_attr_destroy.3                   minix-man
-./usr/man/man3/pthread_attr_get_np.3                    minix-man
-./usr/man/man3/pthread_attr_getdetachstate.3            minix-man
-./usr/man/man3/pthread_attr_getguardsize.3              minix-man
-./usr/man/man3/pthread_attr_getinheritsched.3           minix-man
-./usr/man/man3/pthread_attr_getname_np.3                minix-man
-./usr/man/man3/pthread_attr_getschedparam.3             minix-man
-./usr/man/man3/pthread_attr_getschedpolicy.3            minix-man
-./usr/man/man3/pthread_attr_getscope.3                  minix-man
-./usr/man/man3/pthread_attr_getstack.3                  minix-man
-./usr/man/man3/pthread_attr_getstackaddr.3              minix-man
-./usr/man/man3/pthread_attr_getstacksize.3              minix-man
-./usr/man/man3/pthread_attr_init.3                      minix-man
-./usr/man/man3/pthread_attr_setcreatesuspend_np.3       minix-man
-./usr/man/man3/pthread_attr_setdetachstate.3            minix-man
-./usr/man/man3/pthread_attr_setguardsize.3              minix-man
-./usr/man/man3/pthread_attr_setinheritsched.3           minix-man
-./usr/man/man3/pthread_attr_setname_np.3                minix-man
-./usr/man/man3/pthread_attr_setschedparam.3             minix-man
-./usr/man/man3/pthread_attr_setschedpolicy.3            minix-man
-./usr/man/man3/pthread_attr_setscope.3                  minix-man
-./usr/man/man3/pthread_attr_setstack.3                  minix-man
-./usr/man/man3/pthread_attr_setstackaddr.3              minix-man
-./usr/man/man3/pthread_attr_setstacksize.3              minix-man
-./usr/man/man3/pthread_barrier.3                        minix-man
-./usr/man/man3/pthread_barrier_destroy.3                minix-man
-./usr/man/man3/pthread_barrier_init.3                   minix-man
-./usr/man/man3/pthread_barrier_wait.3                   minix-man
-./usr/man/man3/pthread_barrierattr.3                    minix-man
-./usr/man/man3/pthread_barrierattr_destroy.3            minix-man
-./usr/man/man3/pthread_barrierattr_init.3               minix-man
-./usr/man/man3/pthread_cancel.3                         minix-man
-./usr/man/man3/pthread_cleanup_pop.3                    minix-man
-./usr/man/man3/pthread_cleanup_push.3                   minix-man
-./usr/man/man3/pthread_cond.3                           minix-man
-./usr/man/man3/pthread_cond_broadcast.3                 minix-man
-./usr/man/man3/pthread_cond_destroy.3                   minix-man
-./usr/man/man3/pthread_cond_init.3                      minix-man
-./usr/man/man3/pthread_cond_signal.3                    minix-man
-./usr/man/man3/pthread_cond_timedwait.3                 minix-man
-./usr/man/man3/pthread_cond_wait.3                      minix-man
-./usr/man/man3/pthread_condattr.3                       minix-man
-./usr/man/man3/pthread_condattr_destroy.3               minix-man
-./usr/man/man3/pthread_condattr_init.3                  minix-man
-./usr/man/man3/pthread_condattr_setclock.3              minix-man
-./usr/man/man3/pthread_create.3                         minix-man
-./usr/man/man3/pthread_curcpu_np.3                      minix-man
-./usr/man/man3/pthread_detach.3                         minix-man
-./usr/man/man3/pthread_equal.3                          minix-man
-./usr/man/man3/pthread_exit.3                           minix-man
-./usr/man/man3/pthread_getaffinity_np.3                 minix-man
-./usr/man/man3/pthread_getattr_np.3                     minix-man
-./usr/man/man3/pthread_getname_np.3                     minix-man
-./usr/man/man3/pthread_getschedparam.3                  minix-man
-./usr/man/man3/pthread_getspecific.3                    minix-man
-./usr/man/man3/pthread_join.3                           minix-man
-./usr/man/man3/pthread_key_create.3                     minix-man
-./usr/man/man3/pthread_key_delete.3                     minix-man
-./usr/man/man3/pthread_kill.3                           minix-man
-./usr/man/man3/pthread_mutex.3                          minix-man
-./usr/man/man3/pthread_mutex_destroy.3                  minix-man
-./usr/man/man3/pthread_mutex_init.3                     minix-man
-./usr/man/man3/pthread_mutex_lock.3                     minix-man
-./usr/man/man3/pthread_mutex_trylock.3                  minix-man
-./usr/man/man3/pthread_mutex_unlock.3                   minix-man
-./usr/man/man3/pthread_mutexattr.3                      minix-man
-./usr/man/man3/pthread_mutexattr_destroy.3              minix-man
-./usr/man/man3/pthread_mutexattr_gettype.3              minix-man
-./usr/man/man3/pthread_mutexattr_init.3                 minix-man
-./usr/man/man3/pthread_mutexattr_settype.3              minix-man
-./usr/man/man3/pthread_once.3                           minix-man
-./usr/man/man3/pthread_resume_np.3                      minix-man
-./usr/man/man3/pthread_rwlock.3                         minix-man
-./usr/man/man3/pthread_rwlock_destroy.3                 minix-man
-./usr/man/man3/pthread_rwlock_init.3                    minix-man
-./usr/man/man3/pthread_rwlock_rdlock.3                  minix-man
-./usr/man/man3/pthread_rwlock_timedrdlock.3             minix-man
-./usr/man/man3/pthread_rwlock_timedwrlock.3             minix-man
-./usr/man/man3/pthread_rwlock_tryrdlock.3               minix-man
-./usr/man/man3/pthread_rwlock_trywrlock.3               minix-man
-./usr/man/man3/pthread_rwlock_unlock.3                  minix-man
-./usr/man/man3/pthread_rwlock_wrlock.3                  minix-man
-./usr/man/man3/pthread_rwlockattr.3                     minix-man
-./usr/man/man3/pthread_rwlockattr_destroy.3             minix-man
-./usr/man/man3/pthread_rwlockattr_init.3                minix-man
-./usr/man/man3/pthread_schedparam.3                     minix-man
-./usr/man/man3/pthread_self.3                           minix-man
-./usr/man/man3/pthread_setaffinity_np.3                 minix-man
-./usr/man/man3/pthread_setcancelstate.3                 minix-man
-./usr/man/man3/pthread_setcanceltype.3                  minix-man
-./usr/man/man3/pthread_setname_np.3                     minix-man
-./usr/man/man3/pthread_setschedparam.3                  minix-man
-./usr/man/man3/pthread_setspecific.3                    minix-man
-./usr/man/man3/pthread_sigmask.3                        minix-man
-./usr/man/man3/pthread_spin.3                           minix-man
-./usr/man/man3/pthread_spin_destroy.3                   minix-man
-./usr/man/man3/pthread_spin_init.3                      minix-man
-./usr/man/man3/pthread_spin_lock.3                      minix-man
-./usr/man/man3/pthread_spin_trylock.3                   minix-man
-./usr/man/man3/pthread_spin_unlock.3                    minix-man
-./usr/man/man3/pthread_suspend_np.3                     minix-man
-./usr/man/man3/pthread_testcancel.3                     minix-man
 ./usr/man/man3/ptsname.3                                minix-man
 ./usr/man/man3/ptsname_r.3                              minix-man
 ./usr/man/man3/puffs.3                                  minix-man
@@ -2840,8 +2657,6 @@
 ./usr/man/man3/remque.3                                 minix-man
 ./usr/man/man3/remquo.3                                 minix-man
 ./usr/man/man3/remquof.3                                minix-man
-./usr/man/man3/request_init.3                           minix-man
-./usr/man/man3/request_set.3                            minix-man
 ./usr/man/man3/res_close.3                              minix-man
 ./usr/man/man3/res_findzonecut.3                        minix-man
 ./usr/man/man3/res_getservers.3                         minix-man
@@ -3172,7 +2987,6 @@
 ./usr/man/man3/termcap.3                                minix-man
 ./usr/man/man3/terminfo.3                               minix-man
 ./usr/man/man3/termname.3                               minix-man
-./usr/man/man3/textdomain.3                             minix-man
 ./usr/man/man3/tfind.3                                  minix-man
 ./usr/man/man3/tgamma.3                                 minix-man
 ./usr/man/man3/tgammaf.3                                minix-man
@@ -3415,7 +3229,6 @@
 ./usr/man/man3/zlib.3                                   minix-man
 ./usr/man/man4                                          minix-man
 ./usr/man/man4/aha1540.4                                minix-man
-./usr/man/man4/arp.4                                    minix-man
 ./usr/man/man4/at.4                                     minix-man
 ./usr/man/man4/atf-test-case.4                          minix-man       atf
 ./usr/man/man4/bios.4                                   minix-man
@@ -3425,17 +3238,17 @@
 ./usr/man/man4/disk.4                                   minix-man
 ./usr/man/man4/dosfile.4                                minix-man
 ./usr/man/man4/esdi.4                                   minix-man
-./usr/man/man4/eth.4                                    minix-man       obsolete
+./usr/man/man4/eth.4                                    minix-man
 ./usr/man/man4/fd.4                                     minix-man
-./usr/man/man4/ip.4                                     minix-man       obsolete
+./usr/man/man4/ip.4                                     minix-man
 ./usr/man/man4/keyboard.4                               minix-man
 ./usr/man/man4/lp.4                                     minix-man
 ./usr/man/man4/mtio.4                                   minix-man
 ./usr/man/man4/ncr810.4                                 minix-man
-./usr/man/man4/psip.4                                   minix-man       obsolete
+./usr/man/man4/psip.4                                   minix-man
 ./usr/man/man4/tape.4                                   minix-man
 ./usr/man/man4/tty.4                                    minix-man
-./usr/man/man4/udp.4                                    minix-man       obsolete
+./usr/man/man4/udp.4                                    minix-man
 ./usr/man/man4/uds.4                                    minix-man       obsolete
 ./usr/man/man5                                          minix-man
 ./usr/man/man5/TZ.5                                     minix-man
@@ -3446,17 +3259,10 @@
 ./usr/man/man5/configfile.5                             minix-man
 ./usr/man/man5/cpio.5                                   minix-man
 ./usr/man/man5/crontab.5                                minix-man
-./usr/man/man5/dhclient.conf.5                          minix-man
+./usr/man/man5/dhcp.conf.5                              minix-man
-./usr/man/man5/dhclient.leases.5                        minix-man
-./usr/man/man5/dhcp-eval.5                              minix-man
-./usr/man/man5/dhcp-options.5                           minix-man
-./usr/man/man5/dhcp.conf.5                              minix-man       obsolete
-./usr/man/man5/dhcpcd.conf.5                            minix-man
-./usr/man/man5/dhcpd.conf.5                             minix-man
-./usr/man/man5/dhcpd.leases.5                           minix-man
 ./usr/man/man5/dir.5                                    minix-man       obsolete
 ./usr/man/man5/editrc.5                                 minix-man
-./usr/man/man5/ethers.5                                 minix-man       obsolete
+./usr/man/man5/ethers.5                                 minix-man
 ./usr/man/man5/fstab.5                                  minix-man
 ./usr/man/man5/ftpchroot.5                              minix-man
 ./usr/man/man5/ftpd.conf.5                              minix-man
@@ -3464,14 +3270,8 @@
 ./usr/man/man5/gettytab.5                               minix-man
 ./usr/man/man5/group.5                                  minix-man
 ./usr/man/man5/hosts.5                                  minix-man
-./usr/man/man5/hosts.allow.5                            minix-man
-./usr/man/man5/hosts.deny.5                             minix-man
-./usr/man/man5/hosts_access.5                           minix-man
-./usr/man/man5/hosts_options.5                          minix-man
 ./usr/man/man5/http_status.5                            minix-man       obsolete
 ./usr/man/man5/httpd.conf.5                             minix-man       obsolete
-./usr/man/man5/ifconfig.if.5                            minix-man
-./usr/man/man5/inetd.conf.5                             minix-man
 ./usr/man/man5/info.5                                   minix-man
 ./usr/man/man5/keymap.5                                 minix-man
 ./usr/man/man5/kyua-tester-list.5                       minix-man       kyua
@@ -3479,26 +3279,17 @@
 ./usr/man/man5/kyua.conf.5                              minix-man       kyua
 ./usr/man/man5/kyuafile.5                               minix-man       kyua
 ./usr/man/man5/libarchive-formats.5                     minix-man
-./usr/man/man5/locale.alias.5                           minix-man
 ./usr/man/man5/magic.5                                  minix-man
 ./usr/man/man5/man.conf.5                               minix-man
 ./usr/man/man5/mtree.5                                  minix-man
-./usr/man/man5/named.conf.5                             minix-man
-./usr/man/man5/nsswitch.conf.5                          minix-man
 ./usr/man/man5/openssl.cnf.5                            minix-man       crypto
 ./usr/man/man5/passwd.5                                 minix-man
-./usr/man/man5/pcap-savefile.5                          minix-man
 ./usr/man/man5/pkg_install.conf.5                       minix-man
 ./usr/man/man5/pkg_summary.5                            minix-man
-./usr/man/man5/rc.conf.5                                minix-man
 ./usr/man/man5/resolv.conf.5                            minix-man
-./usr/man/man5/resolvconf.conf.5                        minix-man
 ./usr/man/man5/resolver.5                               minix-man
-./usr/man/man5/rhosts.5                                 minix-man       obsolete
+./usr/man/man5/rhosts.5                                 minix-man
-./usr/man/man5/rndc.conf.5                              minix-man
+./usr/man/man5/serv.access.5                            minix-man
-./usr/man/man5/route.conf.5                             minix-man
-./usr/man/man5/rtadvd.conf.5                            minix-man       use_inet6
-./usr/man/man5/serv.access.5                            minix-man       obsolete
 ./usr/man/man5/statvfs.5                                minix-man
 ./usr/man/man5/syslog.conf.5                            minix-man
 ./usr/man/man5/system.conf.5                            minix-man
@@ -3552,24 +3343,18 @@
 ./usr/man/man7/mandoc_mdoc.7                            minix-man
 ./usr/man/man7/mandoc_roff.7                            minix-man
 ./usr/man/man7/mandoc_tbl.7                             minix-man
-./usr/man/man7/nls.7                                    minix-man
-./usr/man/man7/pcap-filter.7                            minix-man
-./usr/man/man7/pcap-linktype.7                          minix-man
-./usr/man/man7/pcap-tstamp.7                            minix-man
 ./usr/man/man7/pkgsrc.7                                 minix-man
 ./usr/man/man7/re_format.7                              minix-man
 ./usr/man/man8                                          minix-man
 ./usr/man/man8/MAKEDEV.8                                minix-man
-./usr/man/man8/add_route.8                              minix-man       obsolete
+./usr/man/man8/add_route.8                              minix-man
 ./usr/man/man8/adduser.8                                minix-man
-./usr/man/man8/arp.8                                    minix-man
 ./usr/man/man8/atnormalize.8                            minix-man
 ./usr/man/man8/autopart.8                               minix-man
 ./usr/man/man8/backup.8                                 minix-man
 ./usr/man/man8/blacklistctl.8                           minix-man
 ./usr/man/man8/blacklistd.8                             minix-man
 ./usr/man/man8/boot.8                                   minix-man
-./usr/man/man8/bozohttpd.8                              minix-man
 ./usr/man/man8/btrace.8                                 minix-man
 ./usr/man/man8/cdprobe.8                                minix-man
 ./usr/man/man8/chown.8                                  minix-man
@@ -3577,24 +3362,10 @@
 ./usr/man/man8/cleantmp.8                               minix-man
 ./usr/man/man8/config.8                                 minix-man
 ./usr/man/man8/cron.8                                   minix-man
-./usr/man/man8/ddns-confgen.8                           minix-man
 ./usr/man/man8/dev_mkdb.8                               minix-man
 ./usr/man/man8/devsize.8                                minix-man
-./usr/man/man8/dhclient-script.8                        minix-man
-./usr/man/man8/dhclient.8                               minix-man
-./usr/man/man8/dhcpcd-run-hooks.8                       minix-man
-./usr/man/man8/dhcpcd.8                                 minix-man
 ./usr/man/man8/dhcpd.8                                  minix-man
-./usr/man/man8/dhcrelay.8                               minix-man
 ./usr/man/man8/diskctl.8                                minix-man
-./usr/man/man8/dnssec-dsfromkey.8                       minix-man
-./usr/man/man8/dnssec-importkey.8                       minix-man
-./usr/man/man8/dnssec-keyfromlabel.8                    minix-man
-./usr/man/man8/dnssec-keygen.8                          minix-man
-./usr/man/man8/dnssec-revoke.8                          minix-man
-./usr/man/man8/dnssec-settime.8                         minix-man
-./usr/man/man8/dnssec-signzone.8                        minix-man
-./usr/man/man8/dnssec-verify.8                          minix-man
 ./usr/man/man8/fbdctl.8                                 minix-man
 ./usr/man/man8/fdisk.8                                  minix-man
 ./usr/man/man8/fingerd.8                                minix-man
@@ -3609,30 +3380,21 @@
 ./usr/man/man8/groupinfo.8                              minix-man
 ./usr/man/man8/groupmod.8                               minix-man
 ./usr/man/man8/halt.8                                   minix-man
-./usr/man/man8/httpd.8                                  minix-man
+./usr/man/man8/httpd.8                                  minix-man       obsolete
 ./usr/man/man8/i2cscan.8                                minix-man
 ./usr/man/man8/ifconfig.8                               minix-man
 ./usr/man/man8/in.httpd.8                               minix-man       obsolete
-./usr/man/man8/inet.8                                   minix-man       obsolete
+./usr/man/man8/inet.8                                   minix-man
-./usr/man/man8/inetd.8                                  minix-man
 ./usr/man/man8/init.8                                   minix-man
 ./usr/man/man8/installboot_nbsd.8                       minix-man
 ./usr/man/man8/intr.8                                   minix-man
-./usr/man/man8/irdpd.8                                  minix-man       obsolete
+./usr/man/man8/irdpd.8                                  minix-man
 ./usr/man/man8/link.8                                   minix-man
 ./usr/man/man8/loadramdisk.8                            minix-man
-./usr/man/man8/lwresd.8                                 minix-man
 ./usr/man/man8/makefs.8                                 minix-man
 ./usr/man/man8/makewhatis.8                             minix-man
-./usr/man/man8/minix-service.8                          minix-man
 ./usr/man/man8/mknod.8                                  minix-man
 ./usr/man/man8/mtree.8                                  minix-man
-./usr/man/man8/named-checkconf.8                        minix-man
-./usr/man/man8/named-checkzone.8                        minix-man
-./usr/man/man8/named-compilezone.8                      minix-man
-./usr/man/man8/named-journalprint.8                     minix-man
-./usr/man/man8/named.8                                  minix-man
-./usr/man/man8/ndp.8                                    minix-man       inet6
 ./usr/man/man8/netconf.8                                minix-man
 ./usr/man/man8/newfs_ext2fs.8                           minix-man
 ./usr/man/man8/newfs_msdos.8                            minix-man
@@ -3640,44 +3402,29 @@
 ./usr/man/man8/newfs_v7fs.8                             minix-man
 ./usr/man/man8/newroot.8                                minix-man       obsolete
 ./usr/man/man8/nologin.8                                minix-man
-./usr/man/man8/nonamed.8                                minix-man       obsolete
+./usr/man/man8/nonamed.8                                minix-man
-./usr/man/man8/nsec3hash.8                              minix-man
-./usr/man/man8/nslookup.8                               minix-man
 ./usr/man/man8/ossdevlinks.8                            minix-man       obsolete
 ./usr/man/man8/part.8                                   minix-man
 ./usr/man/man8/partition.8                              minix-man
 ./usr/man/man8/ping.8                                   minix-man
-./usr/man/man8/ping6.8                                  minix-man       use_inet6
 ./usr/man/man8/postinstall.8                            minix-man
 ./usr/man/man8/poweroff.8                               minix-man
-./usr/man/man8/pr_routes.8                              minix-man       obsolete
+./usr/man/man8/pr_routes.8                              minix-man
 ./usr/man/man8/printroot.8                              minix-man
 ./usr/man/man8/pwd_mkdb.8                               minix-man
-./usr/man/man8/pwdauth.8                                minix-man       obsolete
+./usr/man/man8/pwdauth.8                                minix-man
-./usr/man/man8/rarpd.8                                  minix-man       obsolete
+./usr/man/man8/rarpd.8                                  minix-man
 ./usr/man/man8/rawspeed.8                               minix-man
-./usr/man/man8/rc.8                                     minix-man
-./usr/man/man8/rc.d.8                                   minix-man
-./usr/man/man8/rc.local.8                               minix-man
-./usr/man/man8/rc.shutdown.8                            minix-man
-./usr/man/man8/rc.subr.8                                minix-man
-./usr/man/man8/rcorder.8                                minix-man
 ./usr/man/man8/rdate.8                                  minix-man
 ./usr/man/man8/readclock.8                              minix-man
 ./usr/man/man8/reboot.8                                 minix-man
 ./usr/man/man8/renice.8                                 minix-man
 ./usr/man/man8/repartition.8                            minix-man
-./usr/man/man8/resolvconf.8                             minix-man
-./usr/man/man8/rndc-confgen.8                           minix-man
-./usr/man/man8/rndc.8                                   minix-man
 ./usr/man/man8/rotate.8                                 minix-man
-./usr/man/man8/route.8                                  minix-man
 ./usr/man/man8/rshd.8                                   minix-man
-./usr/man/man8/rtadvd.8                                 minix-man       use_inet6
 ./usr/man/man8/screendump.8                             minix-man
 ./usr/man/man8/serial-ip.8                              minix-man       obsolete
 ./usr/man/man8/service.8                                minix-man
-./usr/man/man8/services_mkdb.8                          minix-man
 ./usr/man/man8/setup.8                                  minix-man
 ./usr/man/man8/shutdown.8                               minix-man
 ./usr/man/man8/slip.8                                   minix-man
@@ -3688,12 +3435,9 @@
 ./usr/man/man8/sync.8                                   minix-man
 ./usr/man/man8/sysctl.8                                 minix-man
 ./usr/man/man8/syslogd.8                                minix-man
-./usr/man/man8/tcpd.8                                   minix-man       obsolete
+./usr/man/man8/tcpd.8                                   minix-man
-./usr/man/man8/tcpdump.8                                minix-man
-./usr/man/man8/telnetd.8                                minix-man
 ./usr/man/man8/traceroute.8                             minix-man
-./usr/man/man8/traceroute6.8                            minix-man       use_inet6
+./usr/man/man8/uds.8                                    minix-man
-./usr/man/man8/uds.8                                    minix-man       obsolete
 ./usr/man/man8/unix.8                                   minix-man
 ./usr/man/man8/unlink.8                                 minix-man
 ./usr/man/man8/unstr.8                                  minix-man

distrib/sets/lists/minix-tests/mi

@@ -84,9 +84,6 @@
 ./usr/tests/minix-posix/ddekit/ddekittest_driver        minix-tests
 ./usr/tests/minix-posix/ddekit/system.conf              minix-tests
 ./usr/tests/minix-posix/mod                             minix-tests     pic
-./usr/tests/minix-posix/rmibtest                        minix-tests
-./usr/tests/minix-posix/rmibtest/rmibtest               minix-tests
-./usr/tests/minix-posix/rmibtest/rmibtest.conf          minix-tests
 ./usr/tests/minix-posix/run                             minix-tests
 ./usr/tests/minix-posix/t10a                            minix-tests
 ./usr/tests/minix-posix/t11a                            minix-tests
@@ -193,17 +190,11 @@
 ./usr/tests/minix-posix/test88                          minix-tests
 ./usr/tests/minix-posix/test89                          minix-tests
 ./usr/tests/minix-posix/test9                           minix-tests
-./usr/tests/minix-posix/test90                          minix-tests
-./usr/tests/minix-posix/test91                          minix-tests
-./usr/tests/minix-posix/test92                          minix-tests
-./usr/tests/minix-posix/test93                          minix-tests
-./usr/tests/minix-posix/test94                          minix-tests
 ./usr/tests/minix-posix/testinterp                      minix-tests
 ./usr/tests/minix-posix/testisofs                       minix-tests
 ./usr/tests/minix-posix/testkyua                        minix-tests
 ./usr/tests/minix-posix/testmfs                         minix-tests
 ./usr/tests/minix-posix/testrelpol                      minix-tests
-./usr/tests/minix-posix/testrmib                        minix-tests
 ./usr/tests/minix-posix/testsh1                         minix-tests
 ./usr/tests/minix-posix/testsh2                         minix-tests
 ./usr/tests/minix-posix/testvm                          minix-tests

distrib/sets/lists/tests/mi

@@ -2927,46 +2927,46 @@
 ./usr/tests/lib/libprop/Kyuafile		tests-lib-tests		compattestfile,atf,kyua
 ./usr/tests/lib/libprop/t_basic			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libpthread			tests-lib-tests	compattestfile,atf
-./usr/tests/lib/libpthread/Atffile		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/Atffile		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/Kyuafile		tests-lib-tests		compattestfile,atf,kyua
+./usr/tests/lib/libpthread/Kyuafile		tests-lib-tests		compattestfile,atf,kyua,minix-false
-./usr/tests/lib/libpthread/d_mach		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/d_mach		tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/libpthread/dlopen			tests-lib-tests	compattestfile,atf
-./usr/tests/lib/libpthread/dlopen/Atffile	tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/dlopen/Atffile	tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/dlopen/Kyuafile	tests-lib-tests		compattestfile,atf,kyua
+./usr/tests/lib/libpthread/dlopen/Kyuafile	tests-lib-tests		compattestfile,atf,kyua,minix-false
-./usr/tests/lib/libpthread/dlopen/h_pthread_dlopen.so	tests-lib-tests		compattestfile,atf,pic
+./usr/tests/lib/libpthread/dlopen/h_pthread_dlopen.so	tests-lib-tests		compattestfile,atf,pic,minix-false
-./usr/tests/lib/libpthread/dlopen/h_pthread_dlopen.so.1	tests-lib-tests		compattestfile,atf,pic
+./usr/tests/lib/libpthread/dlopen/h_pthread_dlopen.so.1	tests-lib-tests		compattestfile,atf,pic,minix-false
-./usr/tests/lib/libpthread/dlopen/t_dlopen	tests-lib-tests		compattestfile,atf,pic
+./usr/tests/lib/libpthread/dlopen/t_dlopen	tests-lib-tests		compattestfile,atf,pic,minix-false
-./usr/tests/lib/libpthread/dlopen/t_dso_pthread_create	tests-lib-tests		compattestfile,atf,pic
+./usr/tests/lib/libpthread/dlopen/t_dso_pthread_create	tests-lib-tests		compattestfile,atf,pic,minix-false
-./usr/tests/lib/libpthread/dlopen/t_main_pthread_create	tests-lib-tests		compattestfile,atf,pic
+./usr/tests/lib/libpthread/dlopen/t_main_pthread_create	tests-lib-tests		compattestfile,atf,pic,minix-false
-./usr/tests/lib/libpthread/h_atexit		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/h_atexit		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/h_cancel		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/h_cancel		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/h_exit		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/h_exit		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/h_resolv		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/h_resolv		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_atexit		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_atexit		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_barrier		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_barrier		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_cancel		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_cancel		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_cond		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_cond		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_condwait		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_condwait		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_detach		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_detach		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_equal		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_equal		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_exit		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_exit		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_fork		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_fork		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_fpu		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_fpu		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_join		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_join		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_kill		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_kill		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_mutex		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_mutex		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_name		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_name		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_once		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_once		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_preempt		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_preempt		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_resolv		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_resolv		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_rwlock		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_rwlock		tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/libpthread/t_sem		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_siglongjmp		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_siglongjmp		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_sigmask		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_sigmask		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_sigsuspend		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_sigsuspend		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_sleep		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_sleep		tests-lib-tests		compattestfile,atf,minix-false
-./usr/tests/lib/libpthread/t_status		tests-obsolete		obsolete
+./usr/tests/lib/libpthread/t_status		tests-obsolete		obsolete,minix-false
-./usr/tests/lib/libpthread/t_swapcontext	tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libpthread/t_swapcontext	tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/librt				tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librt/Atffile			tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/librt/Kyuafile			tests-lib-tests		compattestfile,atf,kyua,minix-false

distrib/sets/lists/xbase/mi

@@ -1625,7 +1625,7 @@
 ./usr/X11R7/lib/X11/app-defaults/Beforelight		-unknown-	xorg
 ./usr/X11R7/lib/X11/app-defaults/Bitmap			-unknown-	xorg
 ./usr/X11R7/lib/X11/app-defaults/Bitmap-color		-unknown-	xorg
-./usr/X11R7/lib/X11/app-defaults/Chooser		-unknown-	xorg
+./usr/X11R7/lib/X11/app-defaults/Chooser		-unknown-	xorg,minix-false
 ./usr/X11R7/lib/X11/app-defaults/Clock-color		-unknown-	xorg
 ./usr/X11R7/lib/X11/app-defaults/Editres		-unknown-	xorg
 ./usr/X11R7/lib/X11/app-defaults/Editres-color		-unknown-	xorg
@@ -2578,7 +2578,7 @@
 ./usr/X11R7/lib/xorg					base-x11-root	xorg
 ./usr/X11R7/lib/xorg/protocol.txt			-unknown-	xorg
 ./usr/X11R7/libexec					base-x11-root	xorg
-./usr/X11R7/libexec/chooser				-unknown-	xorg
+./usr/X11R7/libexec/chooser				-unknown-	xorg,minix-false
 ./usr/X11R7/man						base-x11-root	xorg
 ./usr/X11R7/man/cat1					base-x11-root	xorg
 ./usr/X11R7/man/cat1/appres.0				-unknown-	.cat,xorg

distrib/sets/lists/xbase/shl.mi

@@ -390,15 +390,15 @@
 ./usr/X11R7/lib/libxcb-record.so		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-record.so.0		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-record.so.0.1		-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libxcb-render-util.so		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.so		-unknown-		xorg,compatx11file,minix-false
-./usr/X11R7/lib/libxcb-render-util.so.0		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.so.0		-unknown-		xorg,compatx11file,minix-false
-./usr/X11R7/lib/libxcb-render-util.so.0.0	-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.so.0.0	-unknown-		xorg,compatx11file,minix-false
 ./usr/X11R7/lib/libxcb-render.so		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-render.so.0		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-render.so.0.1		-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libxcb-reply.so			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.so			-unknown-		xorg,compatx11file,minix-false
-./usr/X11R7/lib/libxcb-reply.so.1		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.so.1		-unknown-		xorg,compatx11file,minix-false
-./usr/X11R7/lib/libxcb-reply.so.1.0		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.so.1.0		-unknown-		xorg,compatx11file,minix-false
 ./usr/X11R7/lib/libxcb-res.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-res.so.0			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-res.so.0.1		-unknown-		xorg,compatx11file

distrib/sets/lists/xcomp/mi

@@ -6319,11 +6319,11 @@
 ./usr/X11R7/lib/libxcb-randr_p.a			-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-record.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libxcb-record_p.a			-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libxcb-render-util.a			-unknown-	xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.a			-unknown-	xorg,compatx11file,minix-false
 ./usr/X11R7/lib/libxcb-render-util_p.a			-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-render.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libxcb-render_p.a			-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libxcb-reply.a				-unknown-	xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.a				-unknown-	xorg,compatx11file,minix-false
 ./usr/X11R7/lib/libxcb-reply_p.a			-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-res.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libxcb-res_p.a				-unknown-	profile,xorg,compatx11file
@@ -6422,8 +6422,8 @@
 ./usr/X11R7/lib/pkgconfig/xcb-randr.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xcb-record.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xcb-render.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/xcb-renderutil.pc		-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xcb-renderutil.pc		-unknown-	xorg,minix-false
-./usr/X11R7/lib/pkgconfig/xcb-reply.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xcb-reply.pc			-unknown-	xorg,minix-false
 ./usr/X11R7/lib/pkgconfig/xcb-res.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xcb-screensaver.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xcb-shape.pc			-unknown-	xorg

distrib/sets/lists/xcomp/shl.mi

@@ -125,9 +125,9 @@
 ./usr/X11R7/lib/libxcb-property_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libxcb-randr_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libxcb-record_pic.a			-unknown-	xorg,picinstall,compatx11file
-./usr/X11R7/lib/libxcb-render-util_pic.a		-unknown-	xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-render-util_pic.a		-unknown-	xorg,picinstall,compatx11file,minix-false
 ./usr/X11R7/lib/libxcb-render_pic.a			-unknown-	xorg,picinstall,compatx11file
-./usr/X11R7/lib/libxcb-reply_pic.a			-unknown-	xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-reply_pic.a			-unknown-	xorg,picinstall,compatx11file,minix-false
 ./usr/X11R7/lib/libxcb-res_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libxcb-screensaver_pic.a		-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libxcb-shape_pic.a			-unknown-	xorg,picinstall,compatx11file

distrib/sets/lists/xdebug/md.i386

@@ -43,27 +43,27 @@
 ./usr/X11R7/lib/modules/extensions/libGLcore_g.a	-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		-unknown-	obsolete
-#./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a		-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a	-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a		-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libmfb_g.a		-unknown-	obsolete
-#./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libxtrap_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/fonts/libfreetype_g.a		-unknown-	obsolete
 ./usr/X11R7/lib/modules/fonts/libtype1_g.a		-unknown-	obsolete
-#./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libexa_g.a			-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libfb_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	debuglib,xorg,obsolete
-#./usr/X11R7/lib/modules/libint10_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libint10_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libpcidata_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libscanpci_g.a			-unknown-	obsolete
-#./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_g.a			-unknown-	debuglib,xorg
-#./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/modules/libxaa_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/libxf1bpp_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libxf4bpp_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		-unknown-	obsolete
@@ -103,7 +103,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr128_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr200_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr300_dri.so.0.debug	obsolete		xorg,obsolete
-#./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug	obsolete		xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libs3v_dri.so.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libsavage_dri.so.0.debug	obsolete		xorg,obsolete
@@ -117,7 +117,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r128_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug	-unknown-		xorg,debug
-#./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/s3v_dri.so.0.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/savage_dri.so.0.debug	-unknown-		obsolete
@@ -187,8 +187,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmware_drv.so.11.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmwlegacy_drv.so.11.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug	obsolete		obsolete
-#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	obsolete		xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	obsolete		xorg,obsolete
-#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	obsolete		xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug	-unknown-		xorg,debug
@@ -216,8 +216,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.13.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmwlegacy_drv.so.11.debug	-unknown-		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug	-unknown-		obsolete
-#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	-unknown-		xorg,debug
-#./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug	-unknown-		xorg,debug

distrib/sets/lists/xdebug/mi

@@ -127,9 +127,9 @@
 ./usr/X11R7/lib/libxcb-property_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-randr_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-record_g.a			-unknown-	debuglib,xorg,compatx11file
-#./usr/X11R7/lib/libxcb-render-util_g.a			-unknown-	debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-render_g.a			-unknown-	debuglib,xorg,compatx11file
-#./usr/X11R7/lib/libxcb-reply_g.a			-unknown-	debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-res_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-screensaver_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-shape_g.a			-unknown-	debuglib,xorg,compatx11file
@@ -410,6 +410,5 @@
 ./usr/libdata/debug/usr/X11R7/bin/xwd.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/xwininfo.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/xwud.debug		-unknown-	debug,xorg
-#./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	-unknown-	debug,xorg
-#./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-		debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-		debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/makekeys.debug        minix-debug     debug,xorg

distrib/sets/lists/xdebug/shl.mi

@@ -128,9 +128,9 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug	-unknown-		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug	-unknown-	#xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug	-unknown-	xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-render.so.0.1.debug	-unknown-		xorg,debug,compatx11file
-#./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug	-unknown-		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-res.so.0.1.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-screensaver.so.0.1.debug	-unknown-	xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-shape.so.0.1.debug	-unknown-		xorg,debug,compatx11file
@@ -147,10 +147,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug		-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug		-unknown-		xorg,debug,compatx11file
-#./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-	xorg,debug
-#./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	-unknown-	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=i386
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	obsolete	obsolete,xorg,debug,!machine=i386,!machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	obsolete	obsolete,xorg,debug
-#./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	-unknown-	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	-unknown-	xorg,debug

distrib/sets/lists/xserver/md.i386

@@ -409,8 +409,8 @@
 ./usr/X11R7/lib/modules/dri/r200_dri.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/r300_dri.so			-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/r300_dri.so.0		-unknown-	xorg
-./usr/X11R7/lib/modules/dri/r600_dri.so			-unknown-	xorg
+./usr/X11R7/lib/modules/dri/r600_dri.so			-unknown-	xorg,minix-false
-./usr/X11R7/lib/modules/dri/r600_dri.so.0		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/r600_dri.so.0		-unknown-	xorg,minix-false
 ./usr/X11R7/lib/modules/dri/radeon_dri.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/s3v_dri.so			-unknown-	obsolete

distrib/sets/lists/xserver/mi

@@ -60,12 +60,12 @@
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=amd64
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
-./usr/X11R7/lib/modules/dri/swrast_dri.so		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so		-unknown-	xorg,minix-false
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0		-unknown-	xorg,minix-false
-./usr/X11R7/lib/modules/dri/gallium_dri.so		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/gallium_dri.so		-unknown-	xorg,minix-false
-./usr/X11R7/lib/modules/dri/gallium_dri.so.0		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/gallium_dri.so.0		-unknown-	xorg,minix-false
-./usr/X11R7/lib/modules/dri/kms_swrast_dri.so		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/kms_swrast_dri.so		-unknown-	xorg,minix-false
-./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0		-unknown-	xorg,minix-false
 ./usr/X11R7/man/cat1/Xmark.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/Xnest.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/Xserver.0				-unknown-	.cat,xorg

distrib/sets/maketars

@@ -185,7 +185,7 @@ for setname in ${lists}; do
 		    > "${SDIR}/flist.${setname}.full" \
 		    || exit 1
 		(
-			echo "/set uname=root gname=wheel"
+			echo "/set uname=root gname=operator"
 			${AWK} -f "${rundir}/join.awk" \
 				"${SDIR}/flist.${setname}.full" "${metalog}"
 			echo "./etc/mtree/set.${setname} type=file mode=0444"

distrib/sets/regpkg

@@ -819,7 +819,7 @@ create_syspkg_tgz()
 					"${spec1}" "${metalog}"
 				${AWK} -f "${rundir}/join.awk" \
 					"${spec1}" /dev/stdin <<EOF
-./etc/mtree/set.${pkgset} type=file mode=0444 uname=root gname=wheel
+./etc/mtree/set.${pkgset} type=file mode=0444 uname=root gname=operator
 EOF
 			else
 				cat "${spec1}"

distrib/sets/sets.subr

@@ -148,7 +148,7 @@ if [ "${MKDEBUG}" = "no" -a "${MKDEBUGLIB}" = "no" ]; then
 	debugset=""
 	xdebugset=""
 else
-	debugset="minix-debug"
+	debugset="debug"
 	xdebugset="xdebug"
 fi
 # Determine lib type. Do this first so stlib also gets set.
@@ -163,7 +163,7 @@ if [ "${MKPIC}" = "no" ]; then
 	shlib=no
 fi
 # LSC for Minix
-nlists="minix-base minix-comp minix-games minix-kernel minix-man $testset $debugset"
+nlists="minix-base minix-comp minix-games minix-kernel minix-man $testset"
 #nlists="base comp $debugset etc games man misc $modset $testset text"
 xlists="xbase xcomp $xdebugset xetc xfont xserver"
 extlists="extbase extcomp extetc"

docs/UPDATING

@@ -1,135 +1,3 @@
-20170303:
-	The entire network stack has been replaced.  This requires two updates.
-	First, BEFORE rebooting, either before or after rebuilding the system,
-	copy the following new configuration files from /usr/src/etc into /etc:
-
-		# cd /usr/src/etc
-		# cp hosts inetd.conf named.conf nsswitch.conf /etc
-
-	Second, AFTER rebooting, set up a new network configuration for your
-	system.  Run netconf(8) and and follow its instructions:
-
-		# netconf
-
-	If you previously configured your network statically and you forgot its
-	settings, take a look at /etc/rc.network.  That file and /etc/inet.conf
-	are no longer used now.  See the ifconfig.if(5) manual page for more
-	information about how network settings are specified going forward.
-
-20170223:
-	Edit your /etc/rc.conf to set rc_configured to YES.  If you do not,
-	your system will refuse to enter multi-user mode after the next reboot.
-	You can then still make the same edit from single user mode, but that
-	is not as easy.
-
-20170222:
-	Because of naming conflicts, the MINIX 3 service(8) utility has been
-	renamed to "minix-service".  After successfully rebuilding the system
-	*and* rebooting (no earlier!), remove the old service utility:
-
-		# rm /bin/service
-
-	Better yet, use the postinstall(8) command to remove all files marked
-	as obsolete.  It is not a bad idea to do this every now and then:
-
-		# postinstall fix obsolete
-
-	..but only ever after the reboot!  Either way, deleting the old service
-	tool will avoid conflicts with the same-named NetBSD utility later on.
-
-20170218:
-	Before starting a build, you will have to update your master.passwd and
-	group files in /etc.  This is needed because we have switched over from
-	the old set of MINIX users and groups to the new set of NetBSD users
-	and groups, as needed by various imported tools.  Follow these steps.
-
-	1. Make a back-up copy of your old master.passwd and group files:
-
-		# cp /etc/master.passwd /etc/master.passwd~
-		# cp /etc/group /etc/group~
-
-	2. Install /usr/src/etc/master.passwd to /etc/master.passwd, and
-	   install /usr/src/etc/group to /etc/group.  If you have NOT created
-	   any local user accounts yourself, for example because you are
-	   upgrading a fresh MINIX 3 installation right away, all you need to
-	   do is copy over those two files:
-
-		# cp /usr/src/etc/master.passwd /etc/master.passwd
-		# cp /usr/src/etc/group /etc/group
-
-	   If you DO have custom user accounts or groups, you need to merge
-	   their lines (and only those!) into the new master.passwd and group
-	   files manually.  If you are unsure whether you have such custom
-	   entries, you can use the following commands:
-
-		# cd /usr/src
-		# git show 68804c2:etc/master.passwd | diff -u - /etc/master.passwd
-		# git show 68804c2:etc/group | diff -u - /etc/group
-
-	   This should show any changes compared to the old two templates.  If
-	   you have such changes, you need to reapply them after copying over
-	   the new two templates.  The following procedure shows one approach:
-
-		# cd /usr/src
-		# cp /etc/master.passwd /tmp/my-passwd
-		# vi /tmp/my-passwd
-		<remove any lines from /tmp/my-passwd that have no password>
-		# cp /usr/src/etc/master.passwd /etc/master.passwd
-		# cat /tmp/my-passwd >> /etc/master.passwd
-		# rm /tmp/my-passwd
-
-	   ..and follow a similar procedure for /etc/group.
-
-	3. Once the new files are in place, update all derived password files:
-
-		# pwd_mkdb -p /etc/master.passwd
-
-	   If you did everything right so far, the following command:
-
-		# postinstall check uid gid
-
-	   ..should show "postinstall checks passed: uid gid" and no failures.
-
-	4. Now perform a full build as usual:
-
-		# cd /usr/src
-		# make build
-
-	   As part of the build, all /dev files will get new proper ownership.
-
-	5. There may still be files that are owned by users and groups that now
-	   have been renumbered.  It is advisable to run at least the following
-	   three commands to apply the renumbering to the most common files:
-
-		# find / -user 2 -exec chown bin \{\} \;
-		# find / -user 5 -exec chown uucp \{\} \;
-		# find / -user 9998 -exec chown games \{\} \;
-
-	   If you have installed custom programs, you may want to check whether
-	   they are not affected by the change.  This should be rare, though.
-
-	Until a subsequent reboot, various running services will show up in
-	ps(1) output and /proc as owned by "postfix".  This is no problem.
-
-20170122:
-	MINIX 3 did not import NetBSD's passwd.conf file, which makes the
-	userland fall back by default to the old, broken UNIX password hashing
-	algorithm. Among other problems, it truncates passwords to the first
-	eight characters.
-
-	Please install /etc/passwd.conf and reset your passwords with passwd.
-
-20160702:
-	Some tools are required to generate the locale resources which are
-	embedded into libintl, which is why you need to run the following:
-
-	for t in gencat locale mkcsmapper mkesdb mklocale
-	do
-		make -C /usr/src/usr.bin/${t} all install
-	done
-
-	Then the usual "make build".
-
 20150623:
 	In order to use the new Unix98 PTYs, and to ensure that the test set
 	continues to pass, please add the following line to your /etc/fstab:

etc/Makefile

@@ -91,21 +91,15 @@ INSTALLATION_DIRS=	binary binary/sets binary/kernel installation
 
 # -rw-r--r--
 BINOWN= root
-BINGRP= wheel
+BINGRP= operator
 UTMPGRP= utmp
 .if defined(__MINIX)
-BIN1+=	\
+BIN1+=	boot.cfg.default \
-	\
-	gettytab \
 	man.conf \
-	\
-	passwd.conf \
 	protocols rc rc.cd rc.subr \
-	rc.shutdown services shells \
+	rc.daemons.dist rs.inet rs.single \
-	syslog.conf
+	services shells syslog.conf \
-# MINIX-only files:
+	termcap utmp gettytab rc.shutdown
-BIN1+=	boot.cfg.default rc.minix \
-	rs.lwip rs.single termcap utmp
 .else
 BIN1+=	bootptab changelist csh.cshrc csh.login \
 	csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
@@ -302,7 +296,7 @@ CONFIGSYMLINKS+=	\
 #
 install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 	${_MKMSG_INSTALL} ${DESTDIR}/etc/master.passwd
-	${ETC_INSTALL_FILE} -o root -g wheel -m 600 \
+	${ETC_INSTALL_FILE} -o root -g operator -m 600 \
 	    master.passwd ${DESTDIR}/etc
 	${TOOL_PWD_MKDB} -p ${PWD_MKDB_ENDIAN} -d ${DESTDIR}/ \
 	    ${DESTDIR}/etc/master.passwd
@@ -310,7 +304,7 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 	( \
 		mode=0600; \
 		for metaent in spwd.db passwd pwd.db; do \
-	    		echo "./etc/$${metaent} type=file mode=$${mode} uname=root gname=wheel tags=etc_pkg"; \
+	    		echo "./etc/$${metaent} type=file mode=$${mode} uname=root gname=operator tags=etc_pkg"; \
 			mode=0644; \
 		done; \
 	) | ${METALOG.add}
@@ -320,12 +314,10 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 .for owner group mode sdir tdir files in \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ group \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ hostname.file \
-		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ hosts \
+		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ inet.conf \
-		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ inetd.conf \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ mk.conf \
+		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ resolv.conf \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ motd \
-		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ named.conf \
-		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ nsswitch.conf \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ rc.conf \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ shrc \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ csh.cshrc \
@@ -359,6 +351,7 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 	${MAKEDIRTARGET} . install-etc-files-safe
 
 install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
+# LSC Minix administrator group is operator, not wheel
 .endif # defined(__MINIX)
 	${_MKMSG_INSTALL} ${DESTDIR}/etc/ttys
 .if !defined(__MINIX)
@@ -400,6 +393,7 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 # TAC to the .for block above.
 .if !defined(__MINIX)
 .for owner group mode file in \
+		${BINOWN} operator	664	/etc/ttys  \
 		${BINOWN} operator	664	/etc/dumpdates  \
 		${BINOWN} operator	600	/etc/skeykeys \
 		root wheel		600	/var/at/at.deny \
@@ -462,6 +456,7 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 .else # LSC Minix Specific
 .for owner group mode sdir tdir files in \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ daily \
+		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ dhcptags.conf \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ rc \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/usr/lib/ crontab \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/etc/ system.conf \
@@ -483,10 +478,9 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 	${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/rc.capes/* ${DESTDIR}/etc/rc.capes
 	${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/minix/drivers/usb/usbd/usbd.conf ${DESTDIR}/etc/system.conf.d/usbd
 .endif # Minix/earm specific
-.for subdir in . defaults mtree namedb rc.d root skel
+.for subdir in . defaults mtree root skel
 	${MAKEDIRTARGET} ${subdir} configinstall
 .endfor
-	${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/dhcpcd/sbin/dhcpcd configinstall
 	${_MKMSG_INSTALL} ${DESTDIR}/usr/lib/fonts
 	${INSTALL_DIR} ${DESTDIR}/usr/lib/fonts
 	${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/fonts/*.fnt ${DESTDIR}/usr/lib/fonts/
@@ -503,7 +497,7 @@ OBSOLETE.files=		base comp etc games man misc text
 OBSOLETE.files=		minix-base minix-comp minix-games minix-kernel minix-man
 .endif # !defined(__MINIX)
 .if ${MKDEBUG} != "no"
-OBSOLETE.files+=	minix-debug
+OBSOLETE.files+=	debug
 .endif
 .if ${MKKMOD} != "no"
 OBSOLETE.files+=	modules

etc/defaults/minix.rc.conf

@@ -1,9 +1,5 @@
 # Minix-specific rc.conf default values
 
-# Override settings in NetBSD's default rc.conf with different default settings
-# for MINIX here, typically to disable scripts that NetBSD enables by default.
-#(nothing yet)
-
 # Where to find servers/drivers binaries
 PKG_SERVICE_DIR=/usr/pkg/service
 SERVICES_DIRS="/service $PKG_SERVICE_DIR"

etc/defaults/rc.conf

@@ -1,382 +1,4 @@
-#	$NetBSD: rc.conf,v 1.133 2015/03/30 10:58:37 chopps Exp $
-#
-# /etc/defaults/rc.conf --
-#	default configuration of /etc/rc.conf
-#
-# see rc.conf(5) for more information.
-#
-# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
-# EDIT /etc/rc.conf INSTEAD.
-#
-
-#
-# Use program=YES to enable program, NO to disable it. program_flags are
-# passed to the program on the command line.
-#
-
-# Uncomment this if you want to use local paths in rc.
-#
-#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
-# Uncomment the following to execute each /etc/rc.d script in
-# the current shell rather than in a subshell.  This may be
-# faster on very slow machines that have an expensive fork(2).
-#	NOTE:	USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
-#		MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
-#
-#rc_fast_and_loose=YES
-
-# If rc_silent is true then /etc/rc will suppress most output to
-# the console.  The default is taken from the AB_SILENT flag passed
-# from the boot loader to the kernel in the boothowto(9) variable.
-#
-# rc_silent_cmd is executed once for each suppressed line of output.
-# Useful values are ":" and "twiddle".
-#
-rc_silent=$( [ "$(( $(/sbin/sysctl -n kern.boothowto 2>/dev/null || echo 0) \
-		    & 0x40000 ))" != 0 ] && echo true || echo false )
-rc_silent_cmd=twiddle
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.
-#
-rc_rcorder_flags=""
-
-# The directories searched for rc scripts.
-# These directories must be part of the root file system.
-rc_directories=/etc/rc.d 
-
-# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
-#
-do_rcshutdown=YES
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
-#
-rcshutdown_rcorder_flags=""
-
-# If this is non-blank, use as the number of seconds to run a watchdog
-# timer which will terminate /etc/rc.shutdown if the timeout expires.
-#
-rcshutdown_timeout=""
-
-
-# Basic network configuration
-#
-
-# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
-# If blank, use /etc/myname.
-#
-hostname=""
-
-# If there's only one way out of your IPv4 network, set this to the hostname
-# or the IPv4 address of the router that will get your packets off the LAN.
-# If blank, use /etc/mygate.
-#
-defaultroute=""
-
-# Same thing for IPv6.  If blank, use /etc/mygate6.
-#
-defaultroute6=""
-
-# The NIS domain name (formerly known as Yellow Pages); not in any way
-# related to Internet domain names.
-# If blank, use /etc/defaultdomain.
-#
-domainname=""
-
-# Filesystems to mount early in boot-up.
-# Note that `/var' is needed in $critical_filesystems_local (or
-# implied as part of `/') as certain services that need /var (such as
-# dhclient) may be needed to get the network operational enough to mount
-# the $critical_filesystems_remote.  Prepending "OPTIONAL:"  means it
-# will not be an error if that file system is not present in fstab(5).
-#
-critical_filesystems_local="OPTIONAL:/var"
-critical_filesystems_remote="OPTIONAL:/usr"
-
-# Swap device controls.
-#
-no_swap=NO		# Set to YES if you have purposefully setup no swap
-			# partitions and don't want to be warned about it.
-swapoff=YES		# Remove block-type swap partitions upon shutdown
-			# This defaults to yes, so that raids shutdown cleanly
-
-# Concatenated disk driver.
-#
-ccd=YES
-
-# RAIDframe driver (manually configured devices).
-#
-raidframe=YES
-
-# Crypto file system.
-#
-cgd=YES
-
-# Logical Volume Manager
-#
-lvm=NO
-
-# One-time actions and programs on boot-up.
-#
-savecore=YES		savecore_flags="-z"
-			savecore_dir="/var/crash"
-resize_root=NO					# resize root to fill partition
-per_user_tmp=NO					# per-user /tmp directories
-per_user_tmp_dir="/private/tmp"			# real storage for /tmp
-clear_tmp=YES					# clear /tmp after reboot
-update_motd=YES					# updates /etc/motd
-dmesg=YES		dmesg_flags=""		# write /var/run/dmesg.boot
-accounting=NO					# uses /var/account/acct
-newsyslog=NO		newsyslog_flags=""	# trim log files
-quota=YES					# check and enable quotas
-ldconfig=YES					# rebuild a.out ldconfig cache
-sysdb=YES					# build system databases
-rndctl=NO		rndctl_flags=""		# configure rndctl(8)
-gpio=NO						# configure GPIO devices
-modules=YES					# process /etc/modules.conf
-
-# cope with other OSes using the real time clock at localtime on this
-# machine (by adjusting kern.rtc_offset at boot)
-rtclocaltime=NO
-
-# NOTE: default coredump name now set in /etc/sysctl.conf
-
-#
-# File system check flags; default to preen mode, checking file systems
-# that are listed in /etc/fstab in parallel as the fsck pass number
-# permits. Fix minor faults automatically, and exit with non 0 only
-# when major errors occur.
-#
-fsck_flags=-p
-
-# Security setting.  If $securelevel is non-empty, the system securelevel
-# is set to this value early in the boot sequence.  Otherwise the default
-# action is taken (see init(8)).
-#
-securelevel=""					# securelevel to set to
-
-# To set the IP address of an interface either use
-#  ifconfig_xxN="IP-NO"
-# where xxN is the interface.  If this variable is not set then
-# contents of the file /etc/ifconfig.xxN is used.
-
-# Networking startup.
-#
-mdnsd=NO
-npf=NO
-ipfilter=NO		ipfilter_flags=""	# uses /etc/ipf.conf
-ipnat=NO					# uses /etc/ipnat.conf
-ipfs=NO			ipfs_flags=""		# save/load ipnat and ipf states
-ipsec=NO					# uses /etc/ipsec.conf
-ipmon=NO		ipmon_flags="-Dns"	# syslog ipfilter messages
-pf=NO			pf_rules="/etc/pf.conf" pf_flags=""
-pflogd=NO
-ftp_proxy=NO
-racoon=NO					# IKE daemon
-auto_ifconfig=YES				# config all avail. interfaces
-net_interfaces=""				# used only if above is NO
-flushroutes=YES					# flush routes in netstart
-dhcpcd=NO
-			dhcpcd_flags="-qM"	# For ifconfig_XXX=dhcp.
-dhclient=NO					# behave as a DHCP client
-			dhclient_flags=""	# blank: config all interfaces
-ntpdate=NO  		ntpdate_flags="-b -s"	# May need '-u' thru firewall
-ppp=YES			ppp_peers=""		# /etc/ppp/peers to call
-ip6mode=host					# host, autohost or router
-ip6uniquelocal=NO				# IPv6 unique-local forwarding
-
-# Special treatment for interfaces that need to be downed on
-# shutdown (because they might cause unnecessary costs or block resources
-# on the peer). All pppoe* interfaces are automatically included in this
-# list, add others here manually.
-#force_down_interfaces=""
-
-ifwatchd=NO	# execute up/down scripts for in-kernel PPPoE interfaces
-	ifwatchd_flags="-u /etc/ppp/ip-up -d /etc/ppp/ip-down pppoe0"
-
-# ALTQ configuration/monitoring daemon
-altqd=NO		altqd_flags=""
-
-# Daemons required by servers.  These are not needed for strictly client use.
-#
-
-# inetd is used to start the IP-based services enabled in /etc/inetd.conf
-#
-inetd=YES		inetd_flags="-l"	# -l logs libwrap
-
-# identd
-#
-identd=NO		identd_flags="-b -l -u nobody"
-
-# rpcbind (formerly known as 'portmap') is used to look up RPC-based services.
-#
-rpcbind=NO		rpcbind_flags="-l"	# -l logs libwrap
-
-# Commonly used daemons.
-#
-syslogd=YES		syslogd_flags="-s"	# -s "secure" unix domain only
-cron=YES
-named=NO		named_flags=""		# see below for named_chrootdir
-timed=NO		timed_flags=""
-ntpd=NO			ntpd_flags=""		# see below for ntpd_chrootdir
-# The default setting for postfix here is YES, but gets re-examined by
-# the rc.d/postfix startup script when it runs.  The script sets
-# _rc_d_postfix to "check", and then causes all rc.conf settings to
-# be re-evaluated.  If the value of $postfix after this is "check",
-# the script then checks to see if /etc/mailer.conf selects the system
-# postfix. If not, it does print a warning and does not start postfix 
-# to avoid conflict with a different MTA.
-postfix=${_rc_d_postfix:-YES}
-lpd=NO			lpd_flags="-s"		# -s "secure" unix domain only
-sshd=NO			sshd_flags=""
-ssh_keygen_flags=""
-ftpd=NO			ftpd_flags="-ll"
-httpd=NO		httpd_flags=""
-			httpd_wwwdir="/var/www"
-			httpd_wwwuser="_httpd"
-
-# To run the named(8) DNS server as an unprivileged user under a
-# chroot(2) cage, uncomment the following after migrating the contents
-# of /etc/namedb to /var/chroot/named/etc/namedb
-#
-#named_chrootdir="/var/chroot/named"
-
-# To run the ntpd(8) NTP server as an unprivileged user under a
-# chroot(2) cage, uncomment the following, after ensuring that:
-#	- The kernel has "pseudo-device clockctl" compiled in
-#	- /dev/clockctl is present
-#
-#ntpd_chrootdir="/var/chroot/ntpd"
-
-# Routing daemons.
-#
-routed=NO		routed_flags="-q"
-gated=NO
-mrouted=NO		mrouted_flags=""
-route6d=NO		route6d_flags=""
-ldpd=NO
-
-# Daemons used to boot other hosts over a network.
-#
-rarpd=NO		rarpd_flags="-a"
-bootparamd=NO		bootparamd_flags=""
-dhcpd=NO		dhcpd_flags="-q"
-dhcrelay=NO		dhcrelay_flags=""
-rbootd=NO		rbootd_flags=""
-mopd=NO			mopd_flags="-a"
-ndbootd=NO		ndbootd_flags="-s /tftpboot /tftpboot/bootyy"
-rtadvd=NO		rtadvd_flags=""
-isibootd=NO		isibootd_flags=""
-
-# X11 daemons.
-#
-xfs=NO			xfs_flags=""		# X11 font server
-xdm=NO			xdm_flags=""		# X11 display manager; needs
-						# wscons=YES for local displays.
-
-# Update fontconfig cache at boot
-fccache=YES
-
-# YP (NIS) daemons.
-#
-ypbind=NO		ypbind_flags=""
-ypserv=NO		ypserv_flags="-d"
-yppasswdd=NO		yppasswdd_flags=""
-
-# NFS daemons and parameters.
-#
-mountd=NO		mountd_flags=""		# NFS mount requests daemon
-nfs_client=NO					# enable client daemons
-nfs_server=NO					# enable server daemons
-			nfsd_flags=""
-lockd=NO		lockd_flags=""
-statd=NO		statd_flags=""
-amd=NO			amd_flags="-l syslog -x error,noinfo,nostats"
-			amd_dir=/amd			# mount dir
-
-# Heimdal Kerberos 5 KDC (with Kerberos IV compatibility)
-kdc=NO			kdc_flags="--detach"
-
-# iSCSI target
-iscsi_target=NO		iscsi_target_flags=""
-# iSCSI kernel initiator
-iscsid=NO
-
-# WPA daemons.
-hostapd=NO		hostapd_flags="-B /etc/hostapd.conf"
-wpa_supplicant=NO	wpa_supplicant_flags="" # -i<if> -c<file>
-
-# ISDN daemon
-isdnd=NO		isdnd_flags=""
-
-# Bluetooth configuration
-bluetooth=NO
-# and the following are used when bluetooth=YES
-btconfig_devices=""                             # all
-bthcid=YES              bthcid_flags=""
-sdpd=YES                sdpd_flags=""
-
-# Other daemons.
-#
-rwhod=NO		rwhod_flags="-u _rwhod"
-devpubd=NO		devpubd_flags=""	# autocreate nodes for new devs
-envsys=NO					# Set /etc/envsys.conf preferences
-
-# Hardware daemons.
-#
-apmd=NO			apmd_flags=""		# APM power management daemon.
-powerd=NO		powerd_flags=""		# power management daemon
-screenblank=NO		screenblank_flags=""	# wscons and FBIO screenblanker
-
-moused=NO					# serial mouse handler
-			moused_flags="-p /dev/tty00"
-
-wdogctl=NO					# watchdog timer control
-#			wdogctl_flags="-k devicename"
-irdaattach=NO					# attach serial lines to IrDA 
-			irdaattach_flags="tty00"
-
-# Configuration of "wscons" console driver virtual screens.
-#
-wscons=NO		wscons_flags=""		# setup wscons from wscons.conf
-
-# Configuration of "wsmoused" console driver cut-n-paste support
-#
-wsmoused=NO		wsmoused_flags=""
-
-# Configuration of "tpctl" touch panel calibration utility
-#
-tpctl=NO		tpctl_flags=""
-
-# Mixer setting
-#
-mixerctl=NO		mixerctl_mixers=""	# "mixer0 mixer1" means saving
-						# and restoring their settings
-
-# Vi recovery notification.  Vi(1)'s -r option can recover files which were
-# accidentally closed.  See vi(1) for more details.
-# 
-virecover=YES
-
-# Veriexec signature loading.
-#
-veriexec=NO
-veriexec_strict=0
-veriexec_verbose=0
-veriexec_flags="-k"
-
-# Entropy load/save to/from /dev/random at startup/shutdown
-#
-random_seed=YES
-
-# Creating / updating of man page index on boot
-makemandb=YES
-
-# blacklist daemon, needs npf
-blacklistd=NO
-
-# Start of MINIX 3 specific settings block
 if [ -r /etc/defaults/minix.rc.conf ]; then
 	. /etc/defaults/minix.rc.conf
 fi
-# End of MINIX 3 specific settings block
+

etc/group

@@ -1,21 +1,18 @@
-wheel:*:0:root
+operator:*:0:
-daemon:*:1:daemon
+daemon:*:1:
-kmem:*:2:root
+bin:*:2:
-sys:*:3:root
+other:*:3:
-tty:*:4:root
+tty:*:4:
-operator:*:0:root
+uucp:*:5:
-mail:*:6:
+news:*:6:
-bin:*:7:
+ftp:*:7:
-wsrc:*:9:
+kmem:*:8:
-maildrop:*:11:
+www:*:9:
-postfix:*:12:
+driver:*:10:
+server:*:11:
 games:*:13:
-named:*:14:
-ntpd:*:15:
-sshd:*:16:
 _pflogd:*:18:
 _rwhod:*:19:
-staff:*:20:root
 _proxy:*:21:
 _timedc:*:22:
 _sdpd:*:23:
@@ -23,13 +20,10 @@ _httpd:*:24:
 _mdnsd:*:25:
 _tests:*:26:
 _tcpdump:*:27:
-_tss:*:28:
+smtpd:*:40:
-_gpio:*:29:
+postfix:*:41:
-_rtadvd:*:30:
+maildrop:*:42:
-guest:*:31:root
+mail:*:43:
-nobody:*:39:
+sshd:*:44:
-utmp:*:45:
+nogroup:*:99:
-authpf:*:72:
 users:*:100:
-dialer:*:117:
-nogroup:*:32766:

etc/hosts

@@ -1,19 +0,0 @@
-#	$NetBSD: hosts,v 1.9 2013/11/24 07:20:01 dholland Exp $
-#
-# Host name database.
-#
-# This file contains addresses and aliases for local hosts whose names
-# need to be resolvable during system boot; typically this includes only
-# the address and FQDN for this machine's hostname.
-#
-# By default this file is consulted before DNS, so adding additional
-# material here that then becomes out of date can lead to confusion.
-# See nsswitch.conf(5).
-#
-::1			localhost localhost.
-127.0.0.1		localhost localhost.
-#
-# RFC 1918 specifies that these networks are "internal":
-# 10.0.0.0        -   10.255.255.255  (10/8 prefix)
-# 172.16.0.0      -   172.31.255.255  (172.16/12 prefix)
-# 192.168.0.0     -   192.168.255.255 (192.168/16 prefix)

etc/inetd.conf

@@ -1,86 +0,0 @@
-#	$NetBSD: inetd.conf,v 1.58 2007/10/16 02:47:14 tls Exp $
-#
-# Internet server configuration database
-#
-#	@(#)inetd.conf	8.2 (Berkeley) 3/18/94
-#
-#http		stream	tcp	nowait:600	_httpd	/usr/libexec/httpd	httpd /var/www
-#http		stream	tcp6	nowait:600	_httpd	/usr/libexec/httpd	httpd /var/www
-#ftp		stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -ll
-#ftp		stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -ll
-#telnet		stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd -a valid
-#telnet		stream	tcp6	nowait	root	/usr/libexec/telnetd	telnetd -a valid
-#shell		stream	tcp	nowait	root	/usr/libexec/rshd	rshd -L
-#shell		stream	tcp6	nowait	root	/usr/libexec/rshd	rshd -L
-#login		stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -L
-#login		stream	tcp6	nowait	root	/usr/libexec/rlogind	rlogind -L
-#exec		stream	tcp	nowait	root	/usr/libexec/rexecd	rexecd
-#exec		stream	tcp6	nowait	root	/usr/libexec/rexecd	rexecd
-#finger		stream	tcp	nowait	nobody	/usr/libexec/fingerd	fingerd -lsmu
-#finger		stream	tcp6	nowait	nobody	/usr/libexec/fingerd	fingerd -lsmu
-#ident		stream	tcp	nowait	nobody	/usr/libexec/identd	identd -l -o OTHER -e -N
-#ident		stream	tcp6	nowait	nobody	/usr/libexec/identd	identd -l -o OTHER -e -N
-#tftp		dgram	udp	wait	root	/usr/libexec/tftpd	tftpd -l -s /tftpboot
-#tftp		dgram	udp6	wait	root	/usr/libexec/tftpd	tftpd -l -s /tftpboot
-#comsat		dgram	udp	wait	root	/usr/libexec/comsat	comsat
-#comsat		dgram	udp6	wait	root	/usr/libexec/comsat	comsat
-#ntalk		dgram	udp	wait	nobody:tty	/usr/libexec/ntalkd	ntalkd
-#bootps		dgram	udp	wait	root	/usr/sbin/bootpd	bootpd
-#
-#	Games
-#
-#hunt		dgram	udp	wait	nobody	/usr/games/huntd	huntd
-#
-#	Internal services
-#
-#tcpmux		stream	tcp	nowait	root	internal
-#echo		stream	tcp	nowait	nobody	internal
-#echo		stream	tcp6	nowait	nobody	internal
-#discard	stream	tcp	nowait	nobody	internal
-#discard	stream	tcp6	nowait	nobody	internal
-#chargen	stream	tcp	nowait	nobody	internal
-#chargen	stream	tcp6	nowait	nobody	internal
-#daytime	stream	tcp	nowait	nobody	internal
-#daytime	stream	tcp6	nowait	nobody	internal
-#time		stream	tcp	nowait	nobody	internal
-#time		stream	tcp6	nowait	nobody	internal
-#echo		dgram	udp	wait	nobody	internal
-#echo		dgram	udp6	wait	nobody	internal
-#discard	dgram	udp	wait	nobody	internal
-#discard	dgram	udp6	wait	nobody	internal
-#chargen	dgram	udp	wait	nobody	internal
-#chargen	dgram	udp6	wait	nobody	internal
-#daytime	dgram	udp	wait	nobody	internal
-#daytime	dgram	udp6	wait	nobody	internal
-#time		dgram	udp	wait	nobody	internal
-#time		dgram	udp6	wait	nobody	internal
-#qotd		stream	tcp	nowait	nobody	/usr/games/fortune	fortune
-#qotd		stream	tcp6	nowait	nobody	/usr/games/fortune	fortune
-#
-#	Kerberos authenticated services
-#
-#klogin		stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -k
-#eklogin	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind -k -x
-#kshell		stream	tcp	nowait	root	/usr/libexec/rshd 	rshd -k
-#
-#	Services run ONLY on the Kerberos server
-#
-#kerberos-adm	stream	tcp	nowait	root	/usr/libexec/kadmind	kadmind
-#kerberos-adm	stream	tcp6	nowait	root	/usr/libexec/kadmind	kadmind
-#kpasswd	dgram	udp	wait	root	/usr/libexec/kpasswdd	kpasswdd
-#kpasswd	dgram	udp6	wait	root	/usr/libexec/kpasswdd	kpasswdd
-#
-# The hprop service is run on slave KDCs to receive the database from
-# the master KDC.
-#hprop		stream	tcp	nowait	root	/usr/libexec/hpropd	hpropd
-#hprop		stream	tcp6	nowait	root	/usr/libexec/hpropd	hpropd
-#
-#	RPC based services
-#
-#rstatd/1-3	dgram	rpc/udp	wait:100 nobody:kmem /usr/libexec/rpc.rstatd rpc.rstatd
-#rstatd/1-3	dgram	rpc/udp6 wait:100 nobody:kmem /usr/libexec/rpc.rstatd rpc.rstatd
-#rusersd/2-3	dgram	rpc/udp	wait:100 nobody	/usr/libexec/rpc.rusersd rpc.rusersd
-#rusersd/2-3	dgram	rpc/udp6 wait:100 nobody /usr/libexec/rpc.rusersd rpc.rusersd
-#walld/1	dgram	rpc/udp	wait	nobody:tty /usr/libexec/rpc.rwalld rpc.rwalld
-#sprayd/1	dgram	rpc/udp	wait	nobody	/usr/libexec/rpc.sprayd	rpc.sprayd
-#rquotad/1-2	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rquotad rpc.rquotad

etc/master.passwd

@@ -1,24 +1,16 @@
-root::0:0::0:0:Charlie &:/root:/bin/sh
+root::0:0::0:0:Big Brother:/root:/bin/sh
-toor:*:0:0::0:0:Bourne-again Superuser:/root:/bin/sh
+daemon:*:1:1::0:0:The Deuce:/etc:/bin/sh
-daemon:*:1:1::0:0:The devil himself:/:/sbin/nologin
+bin:*:2:0::0:0:Binaries Commands and Source:/nonexistent:/bin/sh
-operator:*:2:5::0:0:System &:/usr/guest/operator:/sbin/nologin
+uucp:*:5:5::0:0:UNIX to UNIX copy:/usr/spool/uucp:/usr/bin/uucico
-bin:*:3:7::0:0:Binaries Commands and Source:/:/bin/sh
+news:*:6:6::0:0:Usenet news:/usr/spool/news:/bin/sh
-games:*:7:13::0:0:& pseudo-user:/usr/games:/sbin/nologin
+ftp:*:7:7::0:0:Anonymous FTP:/usr/ftp:/bin/sh
-postfix:*:12:12::0:0:& pseudo-user:/var/spool/postfix:/sbin/nologin
+www:*:9:9::0:0:World Wide Web:/usr/www:/bin/sh
-named:*:14:14::0:0:& pseudo-user:/var/chroot/named:/sbin/nologin
+driver:*:10:10::0:0:Device Drivers:/:/bin/sh
-ntpd:*:15:15::0:0:& pseudo-user:/var/chroot/ntpd:/sbin/nologin
+server:*:11:11::0:0:OS Servers:/:/bin/sh
-sshd:*:16:16::0:0:& pseudo-user:/var/chroot/sshd:/sbin/nologin
+service:*:12:12::0:0:System Services:/:/bin/sh
-_pflogd:*:18:18::0:0:& pseudo-user:/var/chroot/pflogd:/sbin/nologin
+sshd:*:22:22::0:0:sshd:/:/bin/sh
-_rwhod:*:19:19::0:0:& pseudo-user:/var/rwho:/sbin/nologin
+smtpd:*:25:25::0:0:smtpd:/:/bin/sh
-_proxy:*:21:21::0:0:Proxy Services:/nonexistent:/sbin/nologin
+postfix:*:27:27::0:0:postfix:/usr/var/spool/postfix:/usr/bin/false
-_timedc:*:22:22::0:0:& pseudo-user:/nonexistent:/sbin/nologin
+postgres:*:30:30::0:0:postgresql:/:/usr/bin/false
-_sdpd:*:23:23::0:0:& pseudo-user:/nonexistent:/sbin/nologin
+games:*:9998:13::0:0:games:/:/bin/sh
-_httpd:*:24:24::0:0:& pseudo-user:/var/www:/sbin/nologin
+nobody:*:9999:39::0:0:Unprivileged user:/tmp:/bin/sh
-_mdnsd:*:25:25::0:0:& pseudo-user:/nonexistent:/sbin/nologin
-_tests:*:26:26::0:0:& pseudo-user:/nonexistent:/sbin/nologin
-_tcpdump:*:27:27::0:0:& pseudo-user:/var/chroot/tcpdump:/sbin/nologin
-_tss:*:28:28::0:0:& pseudo-user:/var/tpm:/sbin/nologin
-_rtadvd:*:30:30::0:0:& pseudo-user:/var/chroot/rtadvd:/sbin/nologin
-uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
-service:*:999:0::0:0:System Services:/:/sbin/nologin
-nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin

etc/mtree/Minix.bitcode

@@ -1,6 +1,5 @@
  /set type=dir uid=0 gid=0 mode=0755
 
-./usr/lib/i18n/bc
 ./usr/tests/lib
 ./usr/tests/lib/csu
 ./usr/tests/lib/csu/bc

etc/mtree/NetBSD.dist.base

@@ -42,7 +42,6 @@
 ./etc/fonts/conf.d
 ./etc/kyua
 ./etc/mtree
-./etc/namedb
 ./etc/openssl
 ./etc/openssl/certs
 ./etc/openssl/misc
@@ -57,9 +56,6 @@
 ./etc/system.conf.d
 ./home
 ./lib
-./libexec
-./libexec/dhcpcd-hooks
-./libexec/resolvconf
 ./mnt
 ./proc
 ./root
@@ -103,14 +99,8 @@
 ./usr/include/minix
 ./usr/include/msdosfs
 ./usr/include/net
-./usr/include/net80211
-./usr/include/netatalk
-./usr/include/netinet
-./usr/include/netinet6
-./usr/include/netmpls
 ./usr/include/netpgp
 ./usr/include/openssl
-./usr/include/pcap
 ./usr/include/ppath
 ./usr/include/prop
 ./usr/include/protocols
@@ -125,7 +115,6 @@
 ./usr/include/ufs/mfs
 ./usr/include/ufs/ufs
 ./usr/lib
-./usr/lib/i18n
 ./usr/lib/bc
 ./usr/lib/cawf
 ./usr/lib/keymaps
@@ -139,20 +128,13 @@
 ./usr/libdata/debug/lib
 ./usr/libdata/debug/libexec
 ./usr/libdata/debug/sbin
-./usr/libdata/debug/service
 ./usr/libdata/debug/usr
 ./usr/libdata/debug/usr/bin
 ./usr/libdata/debug/usr/games
 ./usr/libdata/debug/usr/lib
-./usr/libdata/debug/usr/lib/i18n
 ./usr/libdata/debug/usr/libexec
 ./usr/libdata/debug/usr/mdec
 ./usr/libdata/debug/usr/sbin
-./usr/libdata/debug/usr/tests
-./usr/libdata/debug/usr/tests/minix-posix
-./usr/libdata/debug/usr/tests/minix-posix/blocktest
-./usr/libdata/debug/usr/tests/minix-posix/ddekit
-./usr/libdata/debug/usr/tests/minix-posix/rmibtest
 ./usr/libexec
 ./usr/log
 ./usr/man
@@ -173,13 +155,12 @@
 ./usr/pkg/var/run
 ./usr/preserve
 ./usr/run
+./usr/sbin
 ./usr/service
 ./usr/service/asr
-./usr/sbin
 ./usr/share
 ./usr/share/atf
 ./usr/share/calendar
-./usr/share/dhcpd
 ./usr/share/doc
 ./usr/share/doc/psd
 ./usr/share/doc/reference
@@ -190,14 +171,10 @@
 ./usr/share/doc/reference/ref1/kyua/kyua-atf-compat
 ./usr/share/doc/reference/ref1/kyua/kyua-cli
 ./usr/share/doc/reference/ref1/kyua/kyua-testers
-./usr/share/doc/reference/ref8
-./usr/share/doc/reference/ref8/bind9
-./usr/share/doc/reference/ref8/bind9/arm
 ./usr/share/doc/usd
 ./usr/share/examples
 ./usr/share/examples/atf
 ./usr/share/examples/blacklist
-./usr/share/examples/dhcp
 ./usr/share/examples/ftpd
 ./usr/share/examples/kyua-cli
 ./usr/share/examples/libsaslc
@@ -205,49 +182,9 @@
 ./usr/share/examples/lua
 ./usr/share/examples/lutok
 ./usr/share/examples/openssl
-./usr/share/examples/rtadvd
 ./usr/share/examples/tmux
 ./usr/share/games
 ./usr/share/games/fortune
-./usr/share/i18n
-./usr/share/i18n/csmapper
-./usr/share/i18n/csmapper/APPLE
-./usr/share/i18n/csmapper/AST
-./usr/share/i18n/csmapper/BIG5
-./usr/share/i18n/csmapper/CBM
-./usr/share/i18n/csmapper/CNS
-./usr/share/i18n/csmapper/CP
-./usr/share/i18n/csmapper/EBCDIC
-./usr/share/i18n/csmapper/GB
-./usr/share/i18n/csmapper/GEORGIAN
-./usr/share/i18n/csmapper/ISO-8859
-./usr/share/i18n/csmapper/ISO646
-./usr/share/i18n/csmapper/JIS
-./usr/share/i18n/csmapper/KAZAKH
-./usr/share/i18n/csmapper/KOI
-./usr/share/i18n/csmapper/KS
-./usr/share/i18n/csmapper/MISC
-./usr/share/i18n/csmapper/TCVN
-./usr/share/i18n/esdb
-./usr/share/i18n/esdb/APPLE
-./usr/share/i18n/esdb/AST
-./usr/share/i18n/esdb/BIG5
-./usr/share/i18n/esdb/CBM
-./usr/share/i18n/esdb/CP
-./usr/share/i18n/esdb/DEC
-./usr/share/i18n/esdb/EBCDIC
-./usr/share/i18n/esdb/EUC
-./usr/share/i18n/esdb/GB
-./usr/share/i18n/esdb/GEORGIAN
-./usr/share/i18n/esdb/ISO-2022
-./usr/share/i18n/esdb/ISO-8859
-./usr/share/i18n/esdb/ISO646
-./usr/share/i18n/esdb/KAZAKH
-./usr/share/i18n/esdb/KOI
-./usr/share/i18n/esdb/MISC
-./usr/share/i18n/esdb/TCVN
-./usr/share/i18n/esdb/UTF
-./usr/share/i18n/iconv
 ./usr/share/info
 ./usr/share/keymaps
 ./usr/share/kyua-atf-compat
@@ -255,415 +192,10 @@
 ./usr/share/kyua-cli/misc
 ./usr/share/kyua-cli/store
 ./usr/share/legal
-./usr/share/locale
-./usr/share/locale/af_ZA.ISO8859-1
-./usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES
-./usr/share/locale/af_ZA.ISO8859-15
-./usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
-./usr/share/locale/af_ZA.UTF-8
-./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
-./usr/share/locale/be
-./usr/share/locale/be/LC_MESSAGES
-./usr/share/locale/be_BY.CP1251
-./usr/share/locale/be_BY.CP1251/LC_MESSAGES
-./usr/share/locale/be_BY.ISO8859-5
-./usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES
-./usr/share/locale/be_BY.UTF-8
-./usr/share/locale/be_BY.UTF-8/LC_MESSAGES
-./usr/share/locale/bg_BG.CP1251
-./usr/share/locale/bg_BG.CP1251/LC_MESSAGES
-./usr/share/locale/bg_BG.UTF-8
-./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES
-./usr/share/locale/ca
-./usr/share/locale/ca/LC_MESSAGES
-./usr/share/locale/ca_ES.ISO8859-1
-./usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
-./usr/share/locale/ca_ES.ISO8859-15
-./usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES
-./usr/share/locale/ca_ES.UTF-8
-./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES
-./usr/share/locale/cs
-./usr/share/locale/cs/LC_MESSAGES
-./usr/share/locale/cs_CZ.ISO8859-2
-./usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES
-./usr/share/locale/cs_CZ.UTF-8
-./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES
-./usr/share/locale/da
-./usr/share/locale/da/LC_MESSAGES
-./usr/share/locale/da_DK.ISO8859-1
-./usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
-./usr/share/locale/da_DK.ISO8859-15
-./usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES
-./usr/share/locale/da_DK.UTF-8
-./usr/share/locale/da_DK.UTF-8/LC_MESSAGES
-./usr/share/locale/de
-./usr/share/locale/de/LC_MESSAGES
-./usr/share/locale/de_AT
-./usr/share/locale/de_AT.ISO8859-1
-./usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
-./usr/share/locale/de_AT.ISO8859-15
-./usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES
-./usr/share/locale/de_AT.UTF-8
-./usr/share/locale/de_AT.UTF-8/LC_MESSAGES
-./usr/share/locale/de_AT/LC_MESSAGES
-./usr/share/locale/de_CH.ISO8859-1
-./usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
-./usr/share/locale/de_CH.ISO8859-15
-./usr/share/locale/de_CH.ISO8859-15/LC_MESSAGES
-./usr/share/locale/de_CH.UTF-8
-./usr/share/locale/de_CH.UTF-8/LC_MESSAGES
-./usr/share/locale/de_DE.ISO8859-1
-./usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
-./usr/share/locale/de_DE.ISO8859-15
-./usr/share/locale/de_DE.ISO8859-15/LC_MESSAGES
-./usr/share/locale/de_DE.UTF-8
-./usr/share/locale/de_DE.UTF-8/LC_MESSAGES
-./usr/share/locale/el
-./usr/share/locale/el/LC_MESSAGES
-./usr/share/locale/el_GR.ISO8859-7
-./usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES
-./usr/share/locale/el_GR.UTF-8
-./usr/share/locale/el_GR.UTF-8/LC_MESSAGES
-./usr/share/locale/en@boldquot
-./usr/share/locale/en@boldquot/LC_MESSAGES
-./usr/share/locale/en@quot
-./usr/share/locale/en@quot/LC_MESSAGES
-./usr/share/locale/en_AU.ISO8859-1
-./usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
-./usr/share/locale/en_AU.ISO8859-15
-./usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
-./usr/share/locale/en_AU.UTF-8
-./usr/share/locale/en_AU.UTF-8/LC_MESSAGES
-./usr/share/locale/en_CA.ISO8859-1
-./usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
-./usr/share/locale/en_CA.ISO8859-15
-./usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
-./usr/share/locale/en_CA.UTF-8
-./usr/share/locale/en_CA.UTF-8/LC_MESSAGES
-./usr/share/locale/en_GB.ISO8859-1
-./usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES
-./usr/share/locale/en_GB.ISO8859-15
-./usr/share/locale/en_GB.ISO8859-15/LC_MESSAGES
-./usr/share/locale/en_GB.UTF-8
-./usr/share/locale/en_GB.UTF-8/LC_MESSAGES
-./usr/share/locale/en_NZ.ISO8859-1
-./usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
-./usr/share/locale/en_NZ.ISO8859-15
-./usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
-./usr/share/locale/en_NZ.UTF-8
-./usr/share/locale/en_NZ.UTF-8/LC_MESSAGES
-./usr/share/locale/en_US.ISO8859-1
-./usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
-./usr/share/locale/en_US.ISO8859-15
-./usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
-./usr/share/locale/en_US.US-ASCII
-./usr/share/locale/en_US.US-ASCII/LC_MESSAGES
-./usr/share/locale/en_US.UTF-8
-./usr/share/locale/en_US.UTF-8/LC_MESSAGES
-./usr/share/locale/eo
-./usr/share/locale/eo/LC_MESSAGES
-./usr/share/locale/es
-./usr/share/locale/es/LC_MESSAGES
-./usr/share/locale/es_ES.ISO8859-1
-./usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES
-./usr/share/locale/es_ES.ISO8859-15
-./usr/share/locale/es_ES.ISO8859-15/LC_MESSAGES
-./usr/share/locale/es_ES.UTF-8
-./usr/share/locale/es_ES.UTF-8/LC_MESSAGES
-./usr/share/locale/et
-./usr/share/locale/et/LC_MESSAGES
-./usr/share/locale/et_EE.ISO8859-15
-./usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES
-./usr/share/locale/et_EE.UTF-8
-./usr/share/locale/et_EE.UTF-8/LC_MESSAGES
-./usr/share/locale/eu_ES.ISO8859-1
-./usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES
-./usr/share/locale/eu_ES.ISO8859-15
-./usr/share/locale/eu_ES.ISO8859-15/LC_MESSAGES
-./usr/share/locale/eu_ES.UTF-8
-./usr/share/locale/eu_ES.UTF-8/LC_MESSAGES
-./usr/share/locale/fi
-./usr/share/locale/fi/LC_MESSAGES
-./usr/share/locale/fi_FI.ISO8859-1
-./usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES
-./usr/share/locale/fi_FI.ISO8859-15
-./usr/share/locale/fi_FI.ISO8859-15/LC_MESSAGES
-./usr/share/locale/fi_FI.UTF-8
-./usr/share/locale/fi_FI.UTF-8/LC_MESSAGES
-./usr/share/locale/fr
-./usr/share/locale/fr/LC_MESSAGES
-./usr/share/locale/fr_BE.ISO8859-1
-./usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
-./usr/share/locale/fr_BE.ISO8859-15
-./usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES
-./usr/share/locale/fr_BE.UTF-8
-./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
-./usr/share/locale/fr_CA.ISO8859-1
-./usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
-./usr/share/locale/fr_CA.ISO8859-15
-./usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
-./usr/share/locale/fr_CA.UTF-8
-./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
-./usr/share/locale/fr_CH.ISO8859-1
-./usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
-./usr/share/locale/fr_CH.ISO8859-15
-./usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES
-./usr/share/locale/fr_CH.UTF-8
-./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES
-./usr/share/locale/fr_FR.ISO8859-1
-./usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
-./usr/share/locale/fr_FR.ISO8859-15
-./usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES
-./usr/share/locale/fr_FR.UTF-8
-./usr/share/locale/fr_FR.UTF-8/LC_MESSAGES
-./usr/share/locale/gl
-./usr/share/locale/gl/LC_MESSAGES
-./usr/share/locale/he
-./usr/share/locale/he/LC_MESSAGES
-./usr/share/locale/hr
-./usr/share/locale/hr/LC_MESSAGES
-./usr/share/locale/hr_HR.ISO8859-2
-./usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES
-./usr/share/locale/hr_HR.UTF-8
-./usr/share/locale/hr_HR.UTF-8/LC_MESSAGES
-./usr/share/locale/hu_HU.ISO8859-2
-./usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES
-./usr/share/locale/hu_HU.UTF-8
-./usr/share/locale/hu_HU.UTF-8/LC_MESSAGES
-./usr/share/locale/hy_AM.ARMSCII-8
-./usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES
-./usr/share/locale/hy_AM.UTF-8
-./usr/share/locale/hy_AM.UTF-8/LC_MESSAGES
-./usr/share/locale/id
-./usr/share/locale/id/LC_MESSAGES
-./usr/share/locale/is_IS.ISO8859-1
-./usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES
-./usr/share/locale/is_IS.ISO8859-15
-./usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES
-./usr/share/locale/is_IS.UTF-8
-./usr/share/locale/is_IS.UTF-8/LC_MESSAGES
-./usr/share/locale/it
-./usr/share/locale/it/LC_MESSAGES
-./usr/share/locale/it_CH.ISO8859-1
-./usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES
-./usr/share/locale/it_CH.ISO8859-15
-./usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES
-./usr/share/locale/it_CH.UTF-8
-./usr/share/locale/it_CH.UTF-8/LC_MESSAGES
-./usr/share/locale/it_IT.ISO8859-1
-./usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES
-./usr/share/locale/it_IT.ISO8859-15
-./usr/share/locale/it_IT.ISO8859-15/LC_MESSAGES
-./usr/share/locale/it_IT.UTF-8
-./usr/share/locale/it_IT.UTF-8/LC_MESSAGES
-./usr/share/locale/ja
-./usr/share/locale/ja/LC_MESSAGES
-./usr/share/locale/ja_JP.ISO-2022-JP
-./usr/share/locale/ja_JP.ISO-2022-JP-2
-./usr/share/locale/ja_JP.ISO-2022-JP-2/LC_MESSAGES
-./usr/share/locale/ja_JP.ISO-2022-JP/LC_MESSAGES
-./usr/share/locale/ja_JP.SJIS
-./usr/share/locale/ja_JP.SJIS/LC_MESSAGES
-./usr/share/locale/ja_JP.UTF-8
-./usr/share/locale/ja_JP.UTF-8/LC_MESSAGES
-./usr/share/locale/ja_JP.ct
-./usr/share/locale/ja_JP.ct/LC_MESSAGES
-./usr/share/locale/ja_JP.eucJP
-./usr/share/locale/ja_JP.eucJP/LC_MESSAGES
-./usr/share/locale/kk_KZ.PT154
-./usr/share/locale/kk_KZ.PT154/LC_MESSAGES
-./usr/share/locale/kk_KZ.UTF-8
-./usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
-./usr/share/locale/ko
-./usr/share/locale/ko/LC_MESSAGES
-./usr/share/locale/ko_KR.UTF-8
-./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES
-./usr/share/locale/ko_KR.eucKR
-./usr/share/locale/ko_KR.eucKR/LC_MESSAGES
-./usr/share/locale/lt_LT.ISO8859-13
-./usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES
-./usr/share/locale/lt_LT.ISO8859-4
-./usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
-./usr/share/locale/lt_LT.UTF-8
-./usr/share/locale/lt_LT.UTF-8/LC_MESSAGES
-./usr/share/locale/nb
-./usr/share/locale/nb/LC_MESSAGES
-./usr/share/locale/nb_NO.ISO8859-1
-./usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
-./usr/share/locale/nb_NO.ISO8859-15
-./usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES
-./usr/share/locale/nb_NO.UTF-8
-./usr/share/locale/nb_NO.UTF-8/LC_MESSAGES
-./usr/share/locale/nn_NO.ISO8859-1
-./usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES
-./usr/share/locale/nn_NO.ISO8859-15
-./usr/share/locale/nn_NO.ISO8859-15/LC_MESSAGES
-./usr/share/locale/nn_NO.UTF-8
-./usr/share/locale/nn_NO.UTF-8/LC_MESSAGES
-./usr/share/locale/nl
-./usr/share/locale/nl/LC_MESSAGES
-./usr/share/locale/nl_BE.ISO8859-1
-./usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES
-./usr/share/locale/nl_BE.ISO8859-15
-./usr/share/locale/nl_BE.ISO8859-15/LC_MESSAGES
-./usr/share/locale/nl_BE.UTF-8
-./usr/share/locale/nl_BE.UTF-8/LC_MESSAGES
-./usr/share/locale/nl_NL.ISO8859-1
-./usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES
-./usr/share/locale/nl_NL.ISO8859-15
-./usr/share/locale/nl_NL.ISO8859-15/LC_MESSAGES
-./usr/share/locale/nl_NL.UTF-8
-./usr/share/locale/nl_NL.UTF-8/LC_MESSAGES
-./usr/share/locale/nn
-./usr/share/locale/nn/LC_MESSAGES
-./usr/share/locale/no
-./usr/share/locale/no/LC_MESSAGES
-./usr/share/locale/no@nynorsk
-./usr/share/locale/no@nynorsk/LC_MESSAGES
-./usr/share/locale/pl
-./usr/share/locale/pl/LC_MESSAGES
-./usr/share/locale/pl_PL.ISO8859-2
-./usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES
-./usr/share/locale/pl_PL.UTF-8
-./usr/share/locale/pl_PL.UTF-8/LC_MESSAGES
-./usr/share/locale/pt
-./usr/share/locale/pt/LC_MESSAGES
-./usr/share/locale/pt_BR
-./usr/share/locale/pt_BR.ISO8859-1
-./usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES
-./usr/share/locale/pt_BR.UTF-8
-./usr/share/locale/pt_BR.UTF-8/LC_MESSAGES
-./usr/share/locale/pt_BR/LC_MESSAGES
-./usr/share/locale/pt_PT.ISO8859-1
-./usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES
-./usr/share/locale/pt_PT.ISO8859-15
-./usr/share/locale/pt_PT.ISO8859-15/LC_MESSAGES
-./usr/share/locale/pt_PT.UTF-8
-./usr/share/locale/pt_PT.UTF-8/LC_MESSAGES
-./usr/share/locale/ro
-./usr/share/locale/ro/LC_MESSAGES
-./usr/share/locale/ro_RO.ISO8859-2
-./usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES
-./usr/share/locale/ro_RO.UTF-8
-./usr/share/locale/ro_RO.UTF-8/LC_MESSAGES
-./usr/share/locale/ru
-./usr/share/locale/ru/LC_MESSAGES
-./usr/share/locale/ru_BY.CP1251
-./usr/share/locale/ru_BY.CP1251/LC_MESSAGES
-./usr/share/locale/ru_BY.UTF-8
-./usr/share/locale/ru_BY.UTF-8/LC_MESSAGES
-./usr/share/locale/ru_RU.CP1251
-./usr/share/locale/ru_RU.CP1251/LC_MESSAGES
-./usr/share/locale/ru_RU.CP866
-./usr/share/locale/ru_RU.CP866/LC_MESSAGES
-./usr/share/locale/ru_RU.ISO8859-5
-./usr/share/locale/ru_RU.ISO8859-5/LC_MESSAGES
-./usr/share/locale/ru_RU.KOI8-R
-./usr/share/locale/ru_RU.KOI8-R/LC_MESSAGES
-./usr/share/locale/ru_RU.UTF-8
-./usr/share/locale/ru_RU.UTF-8/LC_MESSAGES
-./usr/share/locale/sk
-./usr/share/locale/sk/LC_MESSAGES
-./usr/share/locale/sk_SK.ISO8859-2
-./usr/share/locale/sk_SK.ISO8859-2/LC_MESSAGES
-./usr/share/locale/sk_SK.UTF-8
-./usr/share/locale/sk_SK.UTF-8/LC_MESSAGES
-./usr/share/locale/sl
-./usr/share/locale/sl/LC_MESSAGES
-./usr/share/locale/sl_SI.ISO8859-2
-./usr/share/locale/sl_SI.ISO8859-2/LC_MESSAGES
-./usr/share/locale/sl_SI.UTF-8
-./usr/share/locale/sl_SI.UTF-8/LC_MESSAGES
-./usr/share/locale/sr
-./usr/share/locale/sr/LC_MESSAGES
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MESSAGES
-./usr/share/locale/sr_Cyrl_ME.UTF-8
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MESSAGES
-./usr/share/locale/sr_Latn_ME.ISO8859-2
-./usr/share/locale/sr_Latn_ME.ISO8859-2/LC_MESSAGES
-./usr/share/locale/sr_Latn_ME.UTF-8
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
-./usr/share/locale/sr_Cyrl_RS.UTF-8
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_MESSAGES
-./usr/share/locale/sr_Latn_RS.ISO8859-2
-./usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
-./usr/share/locale/sr_Latn_RS.UTF-8
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
-./usr/share/locale/sv
-./usr/share/locale/sv/LC_MESSAGES
-./usr/share/locale/sv_SE.ISO8859-1
-./usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES
-./usr/share/locale/sv_SE.ISO8859-15
-./usr/share/locale/sv_SE.ISO8859-15/LC_MESSAGES
-./usr/share/locale/sv_SE.UTF-8
-./usr/share/locale/sv_SE.UTF-8/LC_MESSAGES
-./usr/share/locale/tr
-./usr/share/locale/tr/LC_MESSAGES
-./usr/share/locale/tr_TR.ISO8859-9
-./usr/share/locale/tr_TR.ISO8859-9/LC_MESSAGES
-./usr/share/locale/tr_TR.UTF-8
-./usr/share/locale/tr_TR.UTF-8/LC_MESSAGES
-./usr/share/locale/uk
-./usr/share/locale/uk/LC_MESSAGES
-./usr/share/locale/uk_UA.CP1251
-./usr/share/locale/uk_UA.CP1251/LC_MESSAGES
-./usr/share/locale/uk_UA.ISO8859-5
-./usr/share/locale/uk_UA.ISO8859-5/LC_MESSAGES
-./usr/share/locale/uk_UA.KOI8-U
-./usr/share/locale/uk_UA.KOI8-U/LC_MESSAGES
-./usr/share/locale/uk_UA.UTF-8
-./usr/share/locale/uk_UA.UTF-8/LC_MESSAGES
-./usr/share/locale/zh_CN
-./usr/share/locale/zh_CN.GB18030
-./usr/share/locale/zh_CN.GB18030/LC_MESSAGES
-./usr/share/locale/zh_CN.UTF-8
-./usr/share/locale/zh_CN.UTF-8/LC_MESSAGES
-./usr/share/locale/zh_CN.eucCN
-./usr/share/locale/zh_CN.eucCN/LC_MESSAGES
-./usr/share/locale/zh_CN/LC_MESSAGES
-./usr/share/locale/zh_HK.Big5hkscs
-./usr/share/locale/zh_HK.Big5hkscs/LC_MESSAGES
-./usr/share/locale/zh_HK.UTF-8
-./usr/share/locale/zh_HK.UTF-8/LC_MESSAGES
-./usr/share/locale/zh_TW
-./usr/share/locale/zh_TW.Big5
-./usr/share/locale/zh_TW.Big5/LC_MESSAGES
-./usr/share/locale/zh_TW.UTF-8
-./usr/share/locale/zh_TW.UTF-8/LC_MESSAGES
-./usr/share/locale/zh_TW.eucTW
-./usr/share/locale/zh_TW.eucTW/LC_MESSAGES
-./usr/share/locale/zh_TW/LC_MESSAGES
 ./usr/share/lua
 ./usr/share/lua/5.3
 ./usr/share/misc
 ./usr/share/mk
-./usr/share/nls
-./usr/share/nls/C
-./usr/share/nls/Pig
-./usr/share/nls/ca
-./usr/share/nls/cs
-./usr/share/nls/de
-./usr/share/nls/es
-./usr/share/nls/es_ES.ISO8859-1
-./usr/share/nls/fi
-./usr/share/nls/fr
-./usr/share/nls/gl_ES.ISO8859-1
-./usr/share/nls/hu_HU.ISO8859-2
-./usr/share/nls/ja_JP.SJIS
-./usr/share/nls/ja_JP.UTF-8
-./usr/share/nls/ja_JP.eucJP
-./usr/share/nls/nl
-./usr/share/nls/no
-./usr/share/nls/pl
-./usr/share/nls/pt_BR.ISO8859-1
-./usr/share/nls/ru_RU.KOI8-R
-./usr/share/nls/sk
-./usr/share/nls/sv
-./usr/share/nls/uk_UA.UTF-8
-./usr/share/nls/zh_CN.UTF-8
 ./usr/share/nvi
 ./usr/share/nvi/catalog
 ./usr/share/terminfo
@@ -701,25 +233,6 @@
 ./usr/var/db/pkg
 ./usr/var/run
 ./var
-./var/chroot
-./var/chroot/named
-./var/chroot/named/dev
-./var/chroot/named/etc
-./var/chroot/named/etc/namedb
-./var/chroot/named/etc/namedb/cache	mode=0775 uname=named gname=named
-./var/chroot/named/etc/namedb/keys	type=dir mode=0775 uname=named gname=named
-./var/chroot/named/usr
-./var/chroot/named/usr/libexec
-./var/chroot/named/var
-./var/chroot/named/var/run	mode=0775 gname=named
-./var/chroot/named/var/run/lwresd	mode=0775 gname=named
-./var/chroot/named/var/run/named	mode=0775 gname=named
-./var/chroot/named/var/tmp	mode=01775 gname=named
-./var/chroot/rtadvd		type=dir  mode=0755
-./var/chroot/rtadvd/etc		type=dir  mode=0755
-./var/chroot/rtadvd/var		type=dir  mode=0755
-./var/chroot/rtadvd/var/run	type=dir  mode=0775 gname=_rtadvd
-./var/chroot/tcpdump		mode=0755
 ./var/db
 ./var/db/obsolete
 ./var/db/xdm
@@ -728,14 +241,11 @@
 ./var/heimdal
 ./var/mail			mode=1777
 ./var/run
-./var/run/lwresd		mode=0775 gname=named
-./var/run/named			mode=0775 gname=named
 ./var/spool
 ./var/spool/ftp
 ./var/spool/ftp/bin
 ./var/spool/ftp/etc
 ./var/spool/ftp/hidden		#breaks cd image generation with non-root users: mode=0111
-./var/www
 
 # Directories with special access rights
 /set type=dir uid=0 gid=0 mode=1777
@@ -746,7 +256,6 @@
 ./usr/tests/minix-posix
 ./usr/tests/minix-posix/blocktest
 ./usr/tests/minix-posix/ddekit
-./usr/tests/minix-posix/rmibtest
 
 # this one is for term(1)
 /set type=dir uid=0 gid=5 mode=775

etc/mtree/special

@@ -13,7 +13,8 @@
 #	  with diff(1)s if $check_changelist is enabled.
 #
 
-/set uname=root gname=wheel
+#__MINIX: gname is not wheel
+/set uname=root gname=operator
 
 .				type=dir  mode=0755
 

etc/named.conf

@@ -1,78 +0,0 @@
-# $NetBSD: named.conf,v 1.7 2013/04/25 20:28:05 christos Exp $
-
-# boot file for secondary name server
-# Note that there should be one primary entry for each SOA record.
-# If you cannot get DNSSEC to work, and you see the following message:
-# DNSKEY: verify failed due to bad signature (keyid=19036): \
-# RRSIG validity period has not begun 
-# Fix your clock. You can comment out the dnssec entries temporarily to
-# get to an ntp server.
-
-options {
-	directory "/etc/namedb";
-	dnssec-enable yes;
-	dnssec-validation auto;
-	dnssec-lookaside auto;
-	managed-keys-directory "keys";
-	bindkeys-file "bind.keys";
-	allow-recursion { localhost; localnets; };
-
-	#
-	# This forces all queries to come from port 53; might be
-	# needed for firewall traversals but should be avoided if
-	# at all possible because of the risk of spoofing attacks.
-	#
-	#query-source address * port 53;
-};
-
-zone "." {
-	type hint;
-	file "root.cache";
-};
-
-zone "localhost" {
-	type master;
-	file "localhost";
-};
-
-zone "127.IN-ADDR.ARPA" {
-	type master;
-	file "127";
-};
-
-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" {
-	type master;
-	file "loopback.v6";
-};
-
-# example secondary server config:
-#
-# zone "Berkeley.EDU" {
-# 	type slave;
-# 	file "berkeley.edu.cache";
-# 	masters {
-# 		128.32.130.11;
-# 		128.32.133.1;
-# 	};
-# };
-
-# zone "32.128.IN-ADDR.ARPA" {
-# 	type slave;
-# 	file "128.32.cache";
-# 	masters {
-# 		128.32.130.11;
-# 		128.32.133.1;
-# 	};
-# };
-
-# example primary server config:
-# 
-# zone "Berkeley.EDU" {
-# 	type master;
-# 	file "berkeley.edu";
-# };
-
-# zone "32.128.IN-ADDR.ARPA" {
-# 	type master;
-# 	file "128.32";
-# };

etc/namedb/127

@@ -1,11 +0,0 @@
-;	$NetBSD: 127,v 1.4 2001/01/28 06:59:31 itojun Exp $
-
-$TTL	3600
-@	IN	SOA	netbsd.org. hostmaster.netbsd.org.  (
-				1999012100	; Serial
-				3600		; Refresh
-				300		; Retry
-				3600000		; Expire
-				3600 )		; Minimum
-	IN	NS	localhost.
-1.0.0	IN	PTR	localhost.

etc/namedb/Makefile

@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2013/04/25 17:02:29 christos Exp $
-
-CONFIGFILES=	127 root.cache localhost loopback.v6 bind.keys
-FILESDIR=	/etc/namedb
-FILESMODE=	644
-
-.include <bsd.prog.mk>

etc/namedb/bind.keys

@@ -1,47 +0,0 @@
-/*	$NetBSD: bind.keys,v 1.1 2013/04/25 17:02:29 christos Exp $	*/
-/* Id: bind.keys,v 1.7 2011-01-03 23:45:07 each Exp  */
-# The bind.keys file is used to override the built-in DNSSEC trust anchors
-# which are included as part of BIND 9.  As of the current release, the only
-# trust anchors it contains are those for the DNS root zone ("."), and for
-# the ISC DNSSEC Lookaside Validation zone ("dlv.isc.org").  Trust anchors
-# for any other zones MUST be configured elsewhere; if they are configured
-# here, they will not be recognized or used by named.
-#
-# The built-in trust anchors are provided for convenience of configuration.
-# They are not activated within named.conf unless specifically switched on.
-# To use the built-in root key, set "dnssec-validation auto;" in
-# named.conf options.  To use the built-in DLV key, set
-# "dnssec-lookaside auto;".  Without these options being set,
-# the keys in this file are ignored.
-#
-# This file is NOT expected to be user-configured.
-#
-# These keys are current as of January 2011.  If any key fails to
-# initialize correctly, it may have expired.  In that event you should
-# replace this file with a current version.  The latest version of
-# bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys.
-
-managed-keys {
-	# ISC DLV: See https://www.isc.org/solutions/dlv for details.
-        # NOTE: This key is activated by setting "dnssec-lookaside auto;"
-        # in named.conf.
-	dlv.isc.org. initial-key 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2
-		brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+
-		1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5
-		ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk
-		Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM
-		QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt
-		TDN0YUuWrBNh";
-
-	# ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml
-	# for current trust anchor information.
-        # NOTE: This key is activated by setting "dnssec-validation auto;"
-        # in named.conf.
-	. initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
-		FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
-		bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
-		X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz
-		W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
-		Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
-		QxA+Uk1ihz0=";
-};

etc/namedb/localhost

@@ -1,12 +0,0 @@
-;	$NetBSD: localhost,v 1.2 2000/05/19 13:07:37 sommerfeld Exp $
-
-$TTL	3600
-@	IN	SOA	netbsd.org. hostmaster.netbsd.org.  (
-				1999012100	; Serial
-				3600		; Refresh
-				300		; Retry
-				3600000		; Expire
-				3600 )		; Minimum
-		IN	NS	localhost.
-localhost.	IN	A	127.0.0.1
-		IN	AAAA	::1

etc/namedb/loopback.v6

@@ -1,11 +0,0 @@
-;	$NetBSD: loopback.v6,v 1.3 2002/01/22 03:27:24 itojun Exp $
-
-$TTL	3600
-@	IN	SOA	netbsd.org. hostmaster.netbsd.org.  (
-				1999012100	; Serial
-				3600		; Refresh
-				300		; Retry
-				3600000		; Expire
-				3600 )		; Minimum
-	IN	NS	localhost.
-	IN	PTR	localhost.

etc/namedb/root.cache

@@ -1,91 +0,0 @@
-;	$NetBSD: root.cache,v 1.18 2014/07/01 03:33:28 taca Exp $
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    June 2, 2014
-;       related version of root zone:   2014060201
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::B
-;
-; FORMERLY C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::C
-;
-; FORMERLY TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
-;
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
-;
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
-; End of File

etc/nsswitch.conf

@@ -1,29 +0,0 @@
-#	$NetBSD: nsswitch.conf,v 1.6 2009/10/25 00:17:06 tsarna Exp $
-#
-# nsswitch.conf(5) -
-#	name service switch configuration file
-#
-
-
-# These are the defaults in libc
-#
-group:		compat
-group_compat:	nis
-hosts:		files dns
-netgroup:	files [notfound=return] nis
-networks:	files
-passwd:		compat
-passwd_compat:	nis
-shells:		files
-
-
-# List of supported sources for each database
-#
-# group:		compat, dns, files, nis
-# group_compat:		dns, nis
-# hosts:		dns, files, nis, mdnsd, multicast_dns
-# netgroup:		files, nis
-# networks:		dns, files, nis
-# passwd:		compat, dns, files, nis
-# passwd_compat:	dns, nis
-# shells:		dns, files, nis

etc/passwd.conf

@@ -1,9 +0,0 @@
-#	$NetBSD: passwd.conf,v 1.3 2010/12/03 21:40:04 jmmv Exp $
-#
-# passwd.conf(5) -
-#	password configuration file
-#
-
-default:
-	localcipher = sha1
-	ypcipher = old

etc/rc

@@ -1,468 +1,246 @@
-#!/bin/sh
+# /etc/rc - System startup script run by init before going multiuser.
-#
-# $NetBSD: rc,v 1.170 2014/07/29 20:39:16 apb Exp $
-#
-# rc --
-#	Run the scripts in /etc/rc.d with rcorder, and log output
-#	to /var/run/rc.log.
 
-#	System startup script run by init(8) on autoboot or after single-user.
+if sysenv bootramdisk >/dev/null
-#	Output and error are redirected to console by init, and the console
+then
-#	is the controlling terminal.
+	/bin/sh /etc/rc.ramdisk
+fi
+
+# Are we booting from CD?
+bootcd="`/bin/sysenv bootcd`"
+
+exec >/dev/log
+exec 2>/dev/log
+exec </dev/null
 
-export HOME=/
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 umask 022
 
-if [ -e ./rc.subr ] ; then
+# Same settings as in the default /etc/profile. We do not source this file
-	. ./rc.subr # for testing
+# as the system administrator may decide to change those values for his users.
-else
+RC_TZ=/etc/rc.timezone
-	. /etc/rc.subr
+PATH=/usr/local/sbin:/usr/pkg/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/pkg/bin:/usr/bin:/bin
-fi
-. /etc/rc.conf
-_rc_conf_loaded=true
 
-: ${RC_LOG_FILE:="/var/run/rc.log"}
+# Set TERM to minix if not present.
+TERM="${TERM-minix}"
 
-# rc.subr redefines echo and printf.  Undo that here.
+export TERM PATH
-unset echo ; unalias echo
-unset printf ; unalias printf
 
-if ! checkyesno rc_configured; then
+# Local variables
-	echo "/etc/rc.conf is not configured.  Multiuser boot aborted."
+ARCH="`sysenv arch`"
-	exit 1
+
+usage()
+{
+    echo >&2 "Usage: $0 [-saf] autoboot|start|stop|down"
+    exec intr sh
+}
+
+up()
+{
+    # Function to dynamically start a system service
+    opt=""
+    prefix=$(expr "$1 " : '\(-\)')
+    if [ "$prefix" = "-" ];
+    then
+         opt=$1
+         shift
+    fi
+    service=$1
+    shift
+
+    service $opt up /service/$service "$@"
+}
+
+edit()
+{
+    # Function to dynamically edit system service settings
+    opt=""
+    prefix=$(expr "$1 " : '\(-\)')
+    if [ "$prefix" = "-" ];
+    then
+         opt=$1
+         shift
+    fi
+    service=$1
+    shift
+
+    # Assume binaries are always in /service or /usr/pkg/service
+    binlocation=/service/$service
+    if [ ! -x $binlocation ]
+    then	binlocation=/usr/pkg/service/$service
+    fi
+
+    # Mostly to find init...
+    if [ ! -x $binlocation ]
+    then	binlocation=/sbin/$service
+    fi
+    service $opt edit $binlocation -label $service "$@"
+}
+
+while getopts 'saf' opt
+do
+    case $opt in
+    s)	sflag=t ;;	# Single user
+    a)	aflag=t ;;	# Ask for /usr
+    f)	fflag=-f ;;	# Force a full file system check
+    *)	usage
+    esac
+done
+shift `expr $OPTIND - 1`
+
+case "$#:$1" in
+1:start|1:stop|1:down|1:autoboot)
+    action=$1
+    ;;
+*)  usage
+esac
+
+case $action in
+autoboot|start)
+    # If booting from CD, we want some directories to be ramdisks
+    if [ ! -z "$bootcd" ]
+    then
+	. /etc/rc.cd
+    fi
+
+    # National keyboard?
+    test -f /etc/keymap && loadkeys /etc/keymap
+
+    # options for fsck. default is -r, which prompts the user for repairs.
+    optname=fsckopts
+    fsckopts=-p
+    if sysenv $optname >/dev/null
+    then       fsckopts="`sysenv $optname`"
+    fi
+
+    if [ "`sysenv debug_fkeys`" != 0 ]
+    then
+        up -n is -period 5HZ
+    fi
+
+    # Set timezone.
+    export TZ=GMT0
+    if [ -f "$RC_TZ" ]
+    then
+         . "$RC_TZ"
+    fi
+
+    # Start real time clock driver & set system time, otherwise default date.
+    up readclock.drv
+    readclock -q || date 201301010000
+
+    # We are not shutting down.
+    if [ -f /etc/nologin ]
+    then
+        rm -f /etc/nologin
+    fi
+
+    # Use MFS binary only from kernel image?
+    if [ "`sysenv bin_img`" = 1 ]
+    then
+        bin_img="-i "
+    fi
+
+    # fsck + mount using /etc/fstab.
+    fsck -x / $fflag $fsckopts
+    mount -a
+
+    if [ -z "`sysenv bootramdisk`" ]
+    then
+	# Unmount and free now defunct ramdisk
+	umount /dev/imgrd > /dev/null || echo "Failed to unmount boot ramdisk"
+	ramdisk 0 /dev/imgrd || echo "Failed to free boot ramdisk"
+    fi
+
+    # Initialize files.
+    >/var/run/utmp				# /etc/utmp keeps track of logins
+    >/var/run/utmpx				# /etc/utmpx keeps track of logins
+
+    # Edit settings for boot system services
+    if [ "`sysenv skip_boot_config`" != 1 ]
+    then
+	edit rs
+	edit vm
+	edit pm
+	edit sched
+	edit vfs
+	edit ds
+	edit tty
+	edit memory
+	edit mib
+	edit pfs
+	edit init
+	#
+	# Keep a copy around to recover the root FS from crashes
+	#
+	rootline=`cat /etc/mtab | grep "on / "`
+	rootfs=fs_`echo "$rootline" | cut -d' ' -f1 | cut -d'/' -f3`
+	roottype=`echo "$rootline" | cut -d' ' -f5`
+	service -c edit /service/$roottype -label $rootfs
+    fi
+
+    if [ "$sflag" ]
+    then
+	echo "Single user. Press ^D to resume multiuser startup."
+	intr sh
+	echo
+    fi
+
+    echo "Multiuser startup in progress ..."
+
+    case "`printroot -r`":$bootcd in
+    /dev/ram:)
+	# Remove boot-only things to make space,
+	# unless booting from CD, in which case we need them.
+	rm -rf /boot
+	# put the compiler on ram
+	cp /usr/lib/em* /usr/lib/cpp* /lib
+    esac
+
+    echo -n "Starting hotplugging infrastructure... "
+    rm -f /var/run/devmand.pid
+    devmand -d /etc/devmand -d /usr/pkg/etc/devmand &
+    echo "done."
+
+    # Things should be alright now.
+    ;;
+down|stop)
+    sync
+    if [ -f /var/run/devmand.pid ]
+    then
+	kill -INT `cat /var/run/devmand.pid`
+	# without this delay the following will
+	# be printed in the console
+	# RS: devman not running?
+	sleep 1
+    fi
+    #
+    # usbd needs to be stopped exactly
+    # at this stage(before stopping devman
+    # and after stopping the services
+    # stated by devmand)
+    if [ -x /usr/pkg/etc/rc.d/usbd ]
+    then
+	/usr/pkg/etc/rc.d/usbd stop
+    fi
+
+    if [ -x /service/usbd ]
+    then
+	service down usbd
+    fi
+
+    # Tell RS server we're going down.
+    service shutdown
+    ;;
+esac
+
+# Further initialization.
+test -f /usr/etc/rc && sh /usr/etc/rc $action
+test -f /usr/local/etc/rc && sh /usr/local/etc/rc $action
+
+# Any messages?
+if [ "$action" = start -o "$action" = autoboot ]
+then	if [ -f /etc/issue ]
+	then	cat /etc/issue
+	fi
 fi
 
-if [ "$1" = autoboot ]; then
+exit 0
-	autoboot=yes
-	rc_fast=yes	# run_rc_command(): do fast booting
-fi
-
-#
-# Completely ignore INT and QUIT at the outer level.  The rc_real_work()
-# function should do something different.
-#
-trap '' INT QUIT
-
-#
-# This string will be used to mark lines of meta-data sent over the pipe
-# from the rc_real_work() function to the rc_postprocess() function.  Lines
-# not so marked are assumed to be output from rc.d scripts.
-#
-# This string is long and unique to ensure that it does not accidentally
-# appear in output from any rc.d script.  It must not contain any
-# characters that are special to glob expansion ('*', '?', '[', or ']').
-#
-rc_metadata_prefix="$0:$$:metadata:";
-
-# Child scripts may sometimes want to print directly to the original
-# stdout and stderr, bypassing the pipe to the postprocessor.  These
-# _rc_*_fd variables are private, shared with /etc/rc.subr, but not
-# intended to be used directly by child scripts.  (Child scripts
-# may use rc.subr's no_rc_postprocess function.)
-#
-_rc_original_stdout_fd=7; export _rc_original_stdout_fd
-_rc_original_stderr_fd=8; export _rc_original_stderr_fd
-eval "exec ${_rc_original_stdout_fd}>&1"
-eval "exec ${_rc_original_stderr_fd}>&2"
-
-#
-# rc_real_work
-#	Do the real work.  Output from this function will be piped into
-#	rc_postprocess(), and some of the output will be marked as
-#	metadata.
-#
-# The body of this function is defined using (...), not {...}, to force
-# it to run in a subshell.
-#
-rc_real_work()
-(
-	stty status '^T'
-
-	# print_rc_metadata() wants to be able to print to the pipe
-	# that goes to our postprocessor, even if its in a context
-	# with redirected output.
-	#
-	_rc_postprocessor_fd=9 ; export _rc_postprocessor_fd
-	_rc_pid=$$ ; export _rc_pid
-	eval "exec ${_rc_postprocessor_fd}>&1"
-
-	# Print a metadata line when we exit
-	#
-	trap 'es=$?; print_rc_metadata "exit:$es"; trap "" 0; exit $es' 0
-
-	#	Set shell to ignore SIGINT, but children will not ignore it.
-	#	Shell catches SIGQUIT and returns to single user.
-	#
-	trap : INT
-	trap '_msg="Boot interrupted at $(date)";
-	      print_rc_metadata "interrupted:${_msg}";
-	      exit 1' QUIT
-
-	print_rc_metadata "start:$(date)"
-
-	#
-	# The stop_boot() function in rc.subr may kill $RC_PID.  We want
-	# it to kill the subshell running this rc_real_work() function,
-	# rather than killing the parent shell, because we want the
-	# rc_postprocess() function to be able to log the error
-	# without being killed itself.
-	#
-	# "$$" is the pid of the top-level shell, not the pid of the
-	# subshell that's executing this function.  The command below
-	# tentatively assumes that the parent of the "/bin/sh -c ..."
-	# process will be the current subshell, and then uses "kill -0
-	# ..." to check the result.  If the "/bin/sh -c ..." process
-	# fails, or returns the pid of an ephemeral process that exits
-	# before the "kill" command, then we fall back to using "$$".
-	#
-	RC_PID=$(/bin/sh -c 'ps -p $$ -o ppid=') || RC_PID=$$
-	kill -0 $RC_PID >/dev/null 2>&1 || RC_PID=$$
-
-	#
-	# As long as process $RC_PID is still running, send a "nop"
-	# metadata message to the postprocessor every few seconds.
-	# This should help flush partial lines that may appear when
-	# rc.d scripts that are NOT marked with "KEYWORD: interactive"
-	# nevertheless attempt to print prompts and wait for input.
-	#
-	(
-	    # First detach from tty, to avoid intercepting SIGINFO.
-	    eval "exec ${_rc_original_stdout_fd}<&-"
-	    eval "exec ${_rc_original_stderr_fd}<&-"
-	    exec </dev/null >/dev/null 2>&1
-	    while kill -0 $RC_PID ; do
-		print_rc_metadata "nop"
-		sleep 3
-	    done
-	) &
-
-	#
-	# Get a list of all rc.d scripts, and use rcorder to choose
-	# what order to execute them.
-	#
-	# For testing, allow RC_FILES_OVERRIDE from the environment to
-	# override this.
-	#
-	print_rc_metadata "cmd-name:rcorder"
-	scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
-		test -d ${rcd} && echo ${rcd}/*;
-	done)
-	files=$(rcorder -s nostart ${rc_rcorder_flags} ${scripts})
-	print_rc_metadata "cmd-status:rcorder:$?"
-
-	if [ -n "${RC_FILES_OVERRIDE}" ]; then
-		files="${RC_FILES_OVERRIDE}"
-	fi
-
-	#
-	# Run the scripts in order.
-	#
-	for _rc_elem in $files; do
-		print_rc_metadata "cmd-name:$_rc_elem"
-		run_rc_script $_rc_elem start
-		print_rc_metadata "cmd-status:$_rc_elem:$?"
-	done
-
-	print_rc_metadata "end:$(date)"
-	exit 0
-)
-
-#
-# rc_postprocess
-#	Post-process the output from the rc_real_work() function.  For
-#	each line of input, we have to decide whether to print the line
-#	to the console, print a twiddle on the console, print a line to
-#	the log, or some combination of these.
-#
-#	If rc_silent is true, then suppress most output, instead running
-#	rc_silent_cmd (typically "twiddle") for each line.
-#
-# The body of this function is defined using (...), not {...}, to force
-# it to run in a subshell.
-#
-# We have to deal with the following constraints:
-#
-#  * There may be no writable file systems early in the boot, so
-#    any use of temporary files would be problematic.
-#
-#  * Scripts run during the boot may clear /tmp and/var/run, so even
-#    if they are writable, using those directories too early may be
-#    problematic.  We assume that it's safe to write to our log file
-#    after the mountcritlocal script has run.
-#
-#  * /usr/bin/tee cannot be used because the /usr file system may not
-#    be mounted early in the boot.
-#
-#  * All calls to the rc_log_message and rc_log_flush functions must be
-#    from the same subshell, otherwise the use of a shell variable to
-#    buffer log messages will fail.
-#
-rc_postprocess()
-(
-	local line
-	local before after
-	local IFS=''
-
-	# Try quite hard to flush the log to disk when we exit.
-	trap 'es=$?; rc_log_flush FORCE; trap "" 0; exit $es' 0
-
-	yesno_to_truefalse rc_silent 2>/dev/null
-
-	while read -r line ; do
-		case "$line" in
-		"${rc_metadata_prefix}"*)
-			after="${line#*"${rc_metadata_prefix}"}"
-			rc_postprocess_metadata "${after}"
-			;;
-		*"${rc_metadata_prefix}"*)
-			# magic string is present, but not at the start of
-			# the line.  Treat it as a partial line of
-			# ordinary data, followed by a line of metadata.
-			before="${line%"${rc_metadata_prefix}"*}"
-			rc_postprocess_partial_line "${before}"
-			after="${line#*"${rc_metadata_prefix}"}"
-			rc_postprocess_metadata "${after}"
-			;;
-		*)
-			rc_postprocess_plain_line "${line}"
-			;;
-		esac
-	done
-
-	# If we get here, then the rc_real_work() function must have
-	# exited uncleanly.  A clean exit would have been accompanied by
-	# a line of metadata that would have prevented us from getting
-	# here.
-	#
-	exit 1
-)
-
-#
-# rc_postprocess_plain_line string
-#	$1 is a string representing a line of output from one of the
-#	rc.d scripts.  Append the line to the log, and also either
-#	display the line on the console, or run $rc_silent_cmd,
-#	depending on the value of $rc_silent.
-#
-rc_postprocess_plain_line()
-{
-	local line="$1"
-	rc_log_message "${line}"
-	if $rc_silent; then
-		eval "$rc_silent_cmd"
-	else
-		printf "%s\n" "${line}"
-	fi
-}
-
-#
-# rc_postprocess_partial_line string
-#	This is just like rc_postprocess_plain_line, except that
-#	a newline is not appended to the string.
-#
-rc_postprocess_partial_line()
-{
-	local line="$1"
-	rc_log_message_n "${line}"
-	if $rc_silent; then
-		eval "$rc_silent_cmd"
-	else
-		printf "%s" "${line}"
-	fi
-}
-
-#
-# rc_postprocess_metadata string
-#	$1 is a string containing metadata from the rc_real_work()
-#	function.  The rc_metadata_prefix marker should already
-#	have been removed before the string is passed to this function.
-#	Take appropriate action depending on the content of the string.
-#
-rc_postprocess_metadata()
-{
-	local metadata="$1"
-	local keyword args
-	local msg
-	local IFS=':'
-
-	# given metadata="bleep:foo bar:baz",
-	# set keyword="bleep", args="foo bar:baz",
-	# $1="foo bar", $2="baz"
-	#
-	keyword="${metadata%%:*}"
-	args="${metadata#*:}"
-	set -- $args
-
-	case "$keyword" in
-	start)
-		# Marks the start of the entire /etc/rc script.
-		# $args contains a date/time.
-		rc_log_message "[$0 starting at $args]"
-		if ! $rc_silent; then
-			# MINIX 3: the clock has not been set yet!
-			#printf "%s\n" "$args"
-			# MINIX 3: end
-		fi
-		;;
-	cmd-name)
-		# Marks the start of a child script (usually one of
-		# the /etc/rc.d/* scripts).
-		rc_log_message "[running $1]"
-		;;
-	cmd-status)
-		# Marks the end of a child script.
-		# $1 is a command name, $2 is the command's exit status.
-		# If the command failed, report it, and add it to a list.
-		if [ "$2" != 0 ]; then
-			rc_failures="${rc_failures}${rc_failures:+ }$1"
-			msg="$1 $(human_exit_code $2)"
-			rc_log_message "$msg"
-			if ! $rc_silent; then
-				printf "%s\n" "$msg"
-			fi
-		fi
-		# After the mountcritlocal script has finished, it's
-		# OK to flush the log to disk
-		case "$1" in
-		*/mountcritlocal)
-			rc_log_flush OK
-			;;
-		esac
-		;;
-	nop)
-		# Do nothing.
-		# This has the side effect of flushing partial lines,
-		# and the echo() and printf() functions in rc.subr take
-		# advantage of this.
-		;;
-	note)
-		# Unlike most metadata messages, which should be used
-		# only by /etc/rc and rc.subr, the "note" message may be
-		# used directly by /etc.rc.d/* and similar scripts.
-		# It adds a note to the log file, without displaying
-		# it to stdout.
-		rc_log_message "[NOTE: $args]"
-		;;
-	end)
-		# Marks the end of processing, after the last child script.
-		# If any child scripts (or other commands) failed, report them.
-		#
-		if [ -n "$rc_failures" ]; then
-			rc_log_message "[failures]"
-			msg="The following components reported failures:"
-			msg="${msg}${nl}$( echo "    ${rc_failures}" | fmt )"
-			msg="${msg}${nl}See ${RC_LOG_FILE} for more information."
-			rc_log_message "${msg}"
-			printf "%s\n" "${msg}"
-		fi
-		#
-		# Report the end date/time, even in silent mode
-		#
-		rc_log_message "[$0 finished at $args]"
-		printf "%s\n" "$args"
-		;;
-	exit)
-		# Marks an exit from the rc_real_work() function.
-		# This may be a normal or abnormal exit.
-		#
-		rc_log_message "[$0 exiting with status $1]"
-		exit $1
-		;;
-	interrupted)
-		# Marks an interrupt trapped by the rc_real_work() function.
-		# $args is a human-readable message.
-		rc_log_message "$args"
-		printf "%s\n" "$args"
-		;;
-	*)
-		# an unrecognised line of metadata
-		rc_log_message "[metadata:${metadata}]"
-		;;
-	esac
-}
-
-#
-# rc_log_message string [...]
-#	Write a message to the log file, or buffer it for later.
-#	This function appends a newline to the message.
-#
-rc_log_message()
-{
-	_rc_log_buffer="${_rc_log_buffer}${*}${nl}"
-	rc_log_flush
-}
-
-#
-# rc_log_message_n string [...]
-#	Just like rc_log_message, except without appending a newline.
-#
-rc_log_message_n()
-{
-	_rc_log_buffer="${_rc_log_buffer}${*}"
-	rc_log_flush
-}
-
-#
-# rc_log_flush [OK|FORCE]
-#	save outstanding messages from $_rc_log_buffer to $RC_LOG_FILE.
-#
-# The log file is expected to reside in the /var/run directory, which
-# may not be writable very early in the boot sequence, and which is
-# erased a little later in the boot sequence.  We therefore avoid
-# writing to the file until we believe it's safe to do so.  We also
-# assume that it's reasonable to always append to the file, never
-# truncating it.
-#
-# Optional argument $1 may be "OK" to report that writing to the log
-# file is expected to be safe from now on, or "FORCE" to force writing
-# to the log file even if it may be unsafe.
-#
-# Returns a non-zero status if messages could not be written to the
-# file.
-#
-rc_log_flush()
-{
-	#
-	# If $_rc_log_flush_ok is false, then it's probably too early to
-	# write to the log file, so don't do it, unless $1 is "FORCE".
-	#
-	: ${_rc_log_flush_ok=false}
-	case "$1:$_rc_log_flush_ok" in
-	OK:*)
-		_rc_log_flush_ok=true
-		;;
-	FORCE:*)
-		: OK just this once
-		;;
-	*:true)
-		: OK
-		;;
-	*)
-		# it's too early in the boot sequence, so don't flush
-		return 1
-		;;
-	esac
-
-	#
-	# Now append the buffer to the file.  The buffer should already
-	# contain a trailing newline, so don't add an extra newline.
-	#
-	if [ -n "$_rc_log_buffer" ]; then
-		if { printf "%s" "${_rc_log_buffer}" >>"${RC_LOG_FILE}" ; } \
-			2>/dev/null
-		then
-			_rc_log_buffer=""
-		else
-			return 1
-		fi
-	fi
-	return 0
-}
-
-#
-# Most of the action is in the rc_real_work() and rc_postprocess()
-# functions.
-#
-rc_real_work "$@" 2>&1 | rc_postprocess
-exit $?

etc/rc.capes/BB-BONE-WTHR-01

@@ -4,18 +4,17 @@
 
 # TSL2550 Ambient Light Sensor
 test -e /dev/tsl2550b3s39 || (cd /dev && MAKEDEV tsl2550b3s39)
-/sbin/minix-service up /service/tsl2550 -dev /dev/tsl2550b3s39 \
+/bin/service up /service/tsl2550 -dev /dev/tsl2550b3s39 \
 	-label tsl2550.3.39 -args 'bus=3 address=0x39' && echo -n " tsl2550"
 
 # SHT21 Temperature and Humidity Sensor
 test -e /dev/sht21b3s40 || (cd /dev && MAKEDEV sht21b3s40)
-/sbin/minix-service up /service/sht21 -dev /dev/sht21b3s40 \
+/bin/service up /service/sht21 -dev /dev/sht21b3s40 \
 	-label sht21.3.40 -args 'bus=3 address=0x40' && echo -n " sht21"
 
 # BMP085 Temperature and Pressure Sensor
 test -e /dev/bmp085b3s77 || (cd /dev && MAKEDEV bmp085b3s77)
-/sbin/minix-service up /service/bmp085 -dev /dev/bmp085b3s77 \
+/bin/service up /service/bmp085 -dev /dev/bmp085b3s77 \
 	-label bmp085.3.77 -args 'bus=3 address=0x77' && echo -n " bmp085"
 
-# FIXME: replace this with proper commands for inetd(8)
+daemonize tcpd http /usr/share/beaglebone/weather/weatherstation.lua
-#daemonize tcpd http /usr/share/beaglebone/weather/weatherstation.lua

etc/rc.cd

@@ -23,7 +23,7 @@ create_ramdisk()
 }
 
 # Create /var ramdisk
-create_ramdisk ram0 /var 768
+create_ramdisk ram0 /var 256
 create_ramdisk ram1 /tmp 128
 create_ramdisk ram2 /usr/run 64
 create_ramdisk ram3 /root 512

etc/rc.conf

@@ -14,9 +14,8 @@ if [ -r /etc/defaults/rc.conf ]; then
 fi
 
 # If this is not set to YES, the system will drop into single-user mode.
-# MINIX 3: for now, this setting is enabled by default.
 #
-rc_configured=YES
+rc_configured=NO
 
 # Add local overrides below.
 #

etc/rc.d/DAEMON

@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $
-#
-
-# PROVIDE: DAEMON
-# REQUIRE: NETWORKING SERVERS
-
-#	This is a dummy dependency, to ensure that general purpose daemons
-#	are run _after_ the above are.

etc/rc.d/DISKS

@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DISKS,v 1.1 2009/04/21 16:08:57 joerg Exp $
-#
-
-# PROVIDE: DISKS
-
-#
-# This is a dummy dependency, to ensure that all disk devices are
-# accessible for fsck and mountcritlocal.
-#

etc/rc.d/LOGIN

@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $
-#
-
-# PROVIDE: LOGIN
-# REQUIRE: DAEMON
-
-#	This is a dummy dependency to ensure user services such as xdm,
-#	inetd, cron and kerberos are started after everything else, incase
-#	the administrator has increased the system security level and
-#	wants to delay user logins until the system is (almost) fully
-#	operational.

etc/rc.d/Makefile

@@ -1,79 +0,0 @@
-# $NetBSD: Makefile,v 1.93 2015/03/30 10:58:37 chopps Exp $
-
-.include <bsd.own.mk>
-
-#
-# NOTE:
-#
-# If you're adding new scripts, don't forget to update following:
-#	src/distrib/sets/lists/etc/mi
-#	src/etc/mtree/special
-#	src/usr.sbin/postinstall/postinstall
-#
-# You can find a script to visualize the dependency graph in
-# src/sbin/rcorder.
-
-# MINIX: the idea for importing rc.d scripts is basically:
-# - in principle, import only the scripts for functionality that we support;
-# - do not change dependencies ("REQUIRE", "BEFORE") in such scripts; rather,
-#   satisfy the dependencies, recursively, with the following rules;
-# - for each such dependency, if it can be disabled (= it has a "rcvar"), then
-#   import its script as is, even if we do not support its functionality;
-# - if such an unsupported dependency is enabled by default as per
-#   etc/defaults/rc.conf, then disable it by overriding it explicitly in
-#   etc/defaults/minix.rc.conf;
-# - for unsupported dependencies that can not be disabled, create a stub for it
-#   (examples: fsck, root, mountcritlocal) but whenever relevant do try to keep
-#   its dependency listing intact so as not to disturb the regular ordering.
-CONFIGFILES=\
-		DAEMON DISKS LOGIN NETWORKING SERVERS \
-		\
-		bootconf.sh \
-		\
-		dhclient dhcpcd dhcpd dhcrelay downinterfaces \
-		fsck ftpd \
-		\
-		\
-		inetd ipfilter ipsec \
-		\
-		\
-		local \
-		\
-		mountcritlocal mountcritremote \
-		named network npf \
-		\
-		pwcheck \
-		\
-		\
-		root rtadvd \
-		\
-		\
-		staticroute sysctl sysdb syslogd \
-		ttys \
-		wscons \
-		
-
-.if defined(__MINIX)
-# MINIX: we will gradually switch over to the NetBSD rc system.  For conflict
-# avoidance, all MINIX-specific scripts should have "minix" in their name.
-CONFIGFILES+=	minixrc
-.endif
-
-FILESDIR=	/etc/rc.d
-FILESMODE=	${BINMODE}
-
-.if !defined(__MINIX) # XXX needs testing first
-.if ${MKX11} != "no"
-CONFIGFILES+=	xdm xfs fccache
-FILESBUILD_xdm=	yes
-FILESBUILD_xfs=	yes
-FILESBUILD_fccache= yes
-.endif # !defined(__MINIX)
-
-.SUFFIXES: .in
-.in:
-	${_MKTARGET_CREATE}
-	${TOOL_SED} -e 's,@X11ROOTDIR@,${X11ROOTDIR},g' < ${.IMPSRC} > ${.TARGET}
-.endif
-
-.include <bsd.prog.mk>

etc/rc.d/NETWORKING

@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $
-#
-
-# PROVIDE: NETWORKING NETWORK
-
-#	This is a dummy dependency, for services which require networking
-#	to be operational before starting.

etc/rc.d/SERVERS

@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $
-#
-
-# PROVIDE: SERVERS
-# REQUIRE: mountcritremote
-
-#	This is a dummy dependency, for early-start servers relying on
-#	some basic configuration.

etc/rc.d/bootconf.sh

@@ -1,87 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: bootconf.sh,v 1.15 2012/12/31 23:21:27 christos Exp $
-#
-
-# PROVIDE: bootconf
-# REQUIRE: mountcritlocal
-# KEYWORD: interactive
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="bootconf"
-start_cmd="bootconf_start"
-stop_cmd=":"
-
-bootconf_start()
-{
-		# Refer to newbtconf(8) for more information
-		#
-
-	if [ ! -e /etc/etc.current ]; then
-		return 0
-	fi
-	if [ -h /etc/etc.default ]; then
-		def=$(ls -ld /etc/etc.default 2>&1)
-		default="${def##*-> *etc.}"
-	else
-		default=current
-	fi
-	if [ "$default" = "current" ]; then
-		def=$(ls -ld /etc/etc.current 2>&1)
-		default="${def##*-> *etc.}"
-	fi
-
-	spc=""
-	for i in /etc/etc.*; do
-		name="${i##/etc/etc.}"
-		case $name in
-		current|default|\*)
-			continue
-			;;	
-		*)
-			if [ "$name" = "$default" ]; then
-				echo -n "${spc}[${name}]"
-			else
-				echo -n "${spc}${name}"
-			fi
-			spc=" "
-			;;
-		esac
-	done
-	echo
-	_DUMMY=/etc/passwd
-	conf=${_DUMMY}
-	while [ ! -d /etc/etc.$conf/. ]; do
-		trap "conf=$default; echo; echo Using default of $default" ALRM
-		echo -n "Which configuration [$default] ? "
-		(sleep 30 && kill -ALRM $RC_PID) >/dev/null 2>&1 &
-		read conf
-		trap : ALRM
-		if [ -z $conf ] ; then
-			conf=$default
-		fi
-		if [ ! -d /etc/etc.$conf/. ]; then
-			conf=${_DUMMY}
-		fi
-	done
-
-	print_rc_metadata "note:Using configuration \"${conf}\""
-
-	case  $conf in
-	current|default)
-		;;
-	*)
-		rm -f /etc/etc.current
-		ln -s etc.$conf /etc/etc.current
-		sync
-		;;
-	esac
-
-	if [ -f /etc/rc.conf ] ; then
-		. /etc/rc.conf
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/dhclient

@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dhclient,v 1.9 2004/08/13 18:08:03 mycroft Exp $
-#
-
-# PROVIDE: dhclient
-# REQUIRE: network mountcritlocal
-# BEFORE:  NETWORKING
-#
-#	Note that there no syslog logging of dhclient messages at boot because
-#	dhclient needs to start before services that syslog depends upon do.
-#
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="dhclient"
-rcvar=$name
-command="/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/dhcpcd

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: dhcpcd
-# REQUIRE: network mountcritlocal
-# BEFORE:  NETWORKING
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name=dhcpcd
-rcvar=$name
-command=/sbin/$name
-extra_commands="reload"
-
-load_rc_config $name
-
-# If the last argument to dhcpcd is a valid interface and the prior argument
-# is not then dhcpcd will start on one interface only and create a pidfile
-# based on the interface name. See PR bin/43490.
-if [ -n "$flags" ]; then
-	myflags=$flags
-else
-	eval myflags=\$${name}_flags
-fi
-ifname="${myflags##* }"
-myflags="${myflags%% $ifname}"
-last_flag="${myflags##* }"
-if /sbin/ifconfig "$ifname" >/dev/null 2>&1 && 
-    ! /sbin/ifconfig "$last_flag" >/dev/null 2>&1
-then
-	pidfile=/var/run/$name-"$ifname".pid
-else
-	pidfile=/var/run/$name.pid
-fi
-unset myflags ifname last_flag
-
-run_rc_command "$1"

etc/rc.d/dhcpd

@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dhcpd,v 1.7 2014/07/17 07:17:03 spz Exp $
-#
-
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="dhcpd"
-rcvar=$name
-command="/usr/sbin/${name}"
-start_precmd="dhcpd_precmd"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/${name}.conf"
-
-dhcpd_precmd()
-{
-        if [ ! -e "/var/db/${name}.leases" ]; then
-                echo "Creating /var/db/${name}.leases"
-                touch /var/db/${name}.leases
-        fi
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/dhcrelay

@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dhcrelay,v 1.6 2004/08/13 18:08:03 mycroft Exp $
-#
-
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="dhcrelay"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/downinterfaces

@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: downinterfaces,v 1.6 2009/09/05 16:26:07 apb Exp $
-#
-
-# PROVIDE: downinterfaces
-# KEYWORD: nostart shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="downinterfaces"
-start_cmd=":"
-stop_cmd="downinterfaces_stop"
-
-downinterfaces_stop()
-{
-	tmp=$(ifconfig -lu)
-	iflist=""
-	for int in $tmp; do
-		case $int in
-		pppoe*)	iflist="$iflist $int"
-			;;
-		esac
-	done
-	iflist="$iflist $force_down_interfaces"
-	if [ "$iflist" != "" ] && [ "$iflist" != " " ]
-	then
-
-		echo "Shutting down interfaces:$iflist"
-		for int in $iflist; do
-			ifconfig $int down
-		done
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/fsck

@@ -1,5 +0,0 @@
-#!/bin/sh
-# MINIX 3 stub.
-
-# PROVIDE: fsck
-# REQUIRE: DISKS

etc/rc.d/ftpd

@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ftpd,v 1.3 2005/08/09 14:59:33 peter Exp $
-#
-
-# PROVIDE: ftpd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="ftpd"
-rcvar=$name
-command="/usr/libexec/${name}"
-command_args="-D"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/inetd

@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: inetd,v 1.7 2004/08/13 18:08:03 mycroft Exp $
-#
-
-# PROVIDE: inetd
-# REQUIRE: DAEMON LOGIN
-# KEYWORD: shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="inetd"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/${name}.conf"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/ipfilter

@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ipfilter,v 1.18 2009/03/23 18:52:02 hannken Exp $
-#
-
-# PROVIDE: ipfilter
-# REQUIRE: root bootconf mountcritlocal tty
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="ipfilter"
-rcvar=$name
-start_precmd="ipfilter_prestart"
-start_cmd="ipfilter_start"
-stop_precmd="test -f /etc/ipf.conf -o -f /etc/ipf6.conf"
-stop_cmd="ipfilter_stop"
-reload_precmd="$stop_precmd"
-reload_cmd="ipfilter_reload"
-resync_precmd="$stop_precmd"
-resync_cmd="ipfilter_resync"
-status_precmd="$stop_precmd"
-status_cmd="ipfilter_status"
-extra_commands="reload resync status"
-
-ipfilter_prestart()
-{
-	if [ ! -f /etc/ipf.conf ] && [ ! -f /etc/ipf6.conf ]; then
-		warn "/etc/ipf*.conf not readable; ipfilter start aborted."
-
-		stop_boot
-		return 1
-	fi
-	return 0
-}
-
-ipfilter_start()
-{
-	echo "Enabling ipfilter."
-	/sbin/ipf ${rc_flags} -E
-
-		# Do the flush first; since older ipf has different semantics.
-		#
-	if [ -f /etc/ipf.conf ]; then
-		/sbin/ipf -Fa
-	fi
-	if [ -f /etc/ipf6.conf ]; then
-		/sbin/ipf -6 -Fa
-	fi
-
-		# Now load the config files
-		#
-	if [ -f /etc/ipf.conf ]; then
-		/sbin/ipf -f /etc/ipf.conf
-	fi
-	if [ -f /etc/ipf6.conf ]; then
-		/sbin/ipf -6 -f /etc/ipf6.conf
-	fi
-}
-
-ipfilter_stop()
-{
-	echo "Disabling ipfilter."
-	/sbin/ipf -D
-}
-
-ipfilter_reload()
-{
-	echo "Reloading ipfilter rules."
-
-		# Do the flush first; since older ipf has different semantics.
-		#
-	if [ -f /etc/ipf.conf ]; then
-		/sbin/ipf -I -Fa
-	fi
-	if [ -f /etc/ipf6.conf ]; then
-		/sbin/ipf -6 -I -Fa
-	fi
-
-		# Now load the config files into the Inactive set
-		#
-	if [ -f /etc/ipf.conf ] && ! /sbin/ipf -I -f /etc/ipf.conf; then
-		err 1 "reload of ipf.conf failed; not swapping to new ruleset."
-	fi
-	if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then
-		err 1 "reload of ipf6.conf failed; not swapping to new ruleset."
-	fi
-		
-		# Swap in the new rules
-		#
-	/sbin/ipf -s
-}
-
-ipfilter_resync()
-{
-	/sbin/ipf -y
-}
-
-ipfilter_status()
-{
-	/sbin/ipf -V
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/ipsec

@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ipsec,v 1.13 2013/09/12 19:52:50 christos Exp $
-#
-
-# PROVIDE: ipsec
-# REQUIRE: root bootconf mountcritlocal tty
-# BEFORE:  DAEMON
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="ipsec"
-rcvar=$name
-start_precmd="ipsec_prestart"
-start_cmd="ipsec_start"
-stop_precmd="test -f /etc/ipsec.conf"
-stop_cmd="ipsec_stop"
-reload_cmd="ipsec_reload"
-extra_commands="reload"
-
-ipsec_prestart()
-{
-	if [ ! -f /etc/ipsec.conf ]; then
-		warn "/etc/ipsec.conf not readable; ipsec start aborted."
-
-		stop_boot
-		return 1
-	fi
-	return 0
-}
-
-ipsec_getip() {
-	ifconfig $1 | while read what address rest; do
-		case "$what" in
-		inet)	echo "$address";;
-		esac
-	done
-}
-
-ipsec_load() {
-	if [ -z "$1" ]; then
-		/sbin/setkey -f /etc/ipsec.conf
-	else
-		sed -e "s/@LOCAL_ADDR@/$1/" < /etc/ipsec.conf | \
-		    /sbin/setkey -f -
-	fi
-}
-
-ipsec_configure() {
-	while true; do
-		local addr="$(ipsec_getip "$ipsec_flags")"
-		case "$addr" in
-		'')		sleep 1;;
-		"0.0.0.0")	sleep 1;;
-		*)		ipsec_load "$addr"; return;;
-		esac
-	done &
-}
-
-ipsec_start()
-{
-	echo "Installing ipsec manual keys/policies."
-	if [ -n "$ipsec_flags" ]; then
-		ipsec_configure
-	else
-		ipsec_load
-	fi
-}
-
-ipsec_stop()
-{
-	echo "Clearing ipsec manual keys/policies."
-
-	# still not 100% sure if we would like to do this.
-	# it is very questionable to do this during shutdown session, since
-	# it can hang any of remaining IPv4/v6 session.
-	#
-	/sbin/setkey -F
-	/sbin/setkey -FP
-}
-
-ipsec_reload()
-{
-	echo "Reloading ipsec manual keys/policies."
-	ipsec_stop
-	ipsec_start
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/local

@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: local,v 1.7 2004/08/13 18:08:03 mycroft Exp $
-#
-
-# REQUIRE: DAEMON
-# PROVIDE: local
-# BEFORE:  LOGIN
-# KEYWORD: shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="local"
-start_cmd="local_start"
-stop_cmd="local_stop"
-
-local_start()
-{
-	if [ -f /etc/rc.local ]; then
-		. /etc/rc.local
-	fi
-}
-
-local_stop()
-{
-	if [ -f /etc/rc.shutdown.local ]; then
-		. /etc/rc.shutdown.local
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/minixrc

@@ -1,17 +0,0 @@
-#!/bin/sh
-# MINIX 3 bridge from NetBSD rc to MINIX rc.  Must be called as the very first
-# script at startup (hence the current 'before').  Ideally the MINIX rc would
-# be decomposed into a number of small rc scripts, though.
-
-# PROVIDE: minixrc
-# BEFORE: DISKS
-# KEYWORD: shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="minixrc"
-start_cmd="sh /etc/rc.minix start"
-stop_cmd="sh /etc/rc.minix stop"
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/mountcritlocal

@@ -1,5 +0,0 @@
-#!/bin/sh
-# MINIX 3 stub.
-
-# PROVIDE: mountcritlocal
-# REQUIRE: fsck

etc/rc.d/mountcritremote

@@ -1,7 +0,0 @@
-#!/bin/sh
-# MINIX 3 stub.
-# Even though this script does not appear to do much, it will in some cases
-# invoke the mount command with a syntax that we do not support.
-
-# PROVIDE: mountcritremote
-# REQUIRE: NETWORKING root mountcritlocal

etc/rc.d/named

@@ -1,146 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: named,v 1.25 2014/07/13 22:06:56 tls Exp $
-#
-
-# PROVIDE: named
-# REQUIRE: NETWORKING mountcritremote syslogd
-# BEFORE:  DAEMON
-# KEYWORD: chrootdir
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="named"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}/${name}.pid"
-start_precmd="named_precmd"
-extra_commands="reload"
-required_dirs="$named_chrootdir"	# if it is set, it must exist
-
-named_migrate()
-{
-	local src="$1"
-	local dst="$2$1"
-	echo "Migrating $src to $dst"
-(
-	diff=false
-	cd "$src"
-	mkdir -p "$dst"
-	for f in $(find . -type f)
-	do
-		f="${f##./}"
-		case "$f" in
-		*/*)
-			ds="$(dirname "$f")"
-			dd="$dst/$ds"
-			mkdir -p "$dd"
-			chmod "$(stat -f "%p" "$ds" |
-			    sed -e 's/.*\([0-7][0-7][0-7][0-7]\)$/\1/g')" "$dd"
-			chown "$(stat -f %u:%g "$ds")" "$dd"
-			;;
-		*)
-			;;
-		esac
-		if [ -r "$dst/$f" ]
-		then
-			if ! cmp "$f" "$dst/$f"; then
-				diff=true
-			fi
-		else
-			cp -p "$f" "$dst/$f"
-		fi
-	done
-	if $diff; then
-		echo "Cannot complete migration because files are different"
-		echo "Run 'diff -r $src $dst' resolve the differences"
-	else
-		rm -fr "$src"
-		ln -s "$dst" "$src"
-	fi
-)
-}
-
-named_precmd()
-{
-	if [ ! -e "/etc/rndc.key" ]; then
-		echo "Generating rndc.key"
-		/usr/sbin/rndc-confgen -a
-	fi
-
-	if [ -z "$named_chrootdir" ]; then
-		if [ ! -d "/etc/namedb/keys" ]; then
-			mkdir -m 775 "/etc/namedb/keys"
-			chown named:named "/etc/namedb/keys"
-		fi
-		return 0;
-	fi
-
-	# If running in a chroot cage, ensure that the appropriate files
-	# exist inside the cage, as well as helper symlinks into the cage 
-	# from outside.
-	#
-	# As this is called after the is_running and required_dir checks
-	# are made in run_rc_command(), we can safely assume ${named_chrootdir}
-	# exists and named isn't running at this point (unless forcestart
-	# is used).
-	#
-	case "$($command -v)" in
-	BIND*)	# 9 no group, named-xfer, or ndc
-		;;
-	named*)	# 4 and 8
-		rc_flags="-g named $rc_flags"
-		if [ ! -x "${named_chrootdir}/usr/libexec/named-xfer" -o \
-		    "${named_chrootdir}/usr/libexec/named-xfer" -ot \
-		    /usr/libexec/named-xfer ]; then
-			rm -f "${named_chrootdir}/usr/libexec/named-xfer"
-			cp -p /usr/libexec/named-xfer \
-			    "${named_chrootdir}/usr/libexec"
-		fi
-		ln -fs "${named_chrootdir}/var/run/ndc" /var/run/ndc
-		;;
-	esac
-
-	for i in null random urandom; do
-		if [ ! -c "${named_chrootdir}/dev/$i" ]; then
-			rm -f "${named_chrootdir}/dev/$i"
-			(cd /dev && 
-			    /bin/pax -rw -pe "$i" "${named_chrootdir}/dev")
-		fi
-	done
-
-	if [ ! -h /etc/namedb ]; then
-		named_migrate /etc/namedb ${named_chrootdir}
-	fi
-
-	for i in named.conf rndc.key; do
-		if [ \( -r "/etc/$i" \) -a \( ! -h "/etc/$i" \) -a \
-		     \( ! -r "${named_chrootdir}/etc/$i" \) ]; then
-			mv "/etc/$i" "${named_chrootdir}/etc/$i"
-			ln -s "${named_chrootdir}/etc/$i" "/etc/$i"
-		fi
-	done
-
-	if [ \( ! -r ${named_chrootdir}/etc/named.conf \) -a \
-	    \( -r ${named_chrootdir}/etc/namedb/named.conf \) ]; then
-		ln -s namedb/named.conf ${named_chrootdir}/etc
-	fi
-
-	if [ -f /etc/localtime ]; then
-		cmp -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
-		    cp -p /etc/localtime "${named_chrootdir}/etc/localtime"
-	fi
-
-	local piddir="$(dirname "${pidfile}")"
-	mkdir -p "${named_chrootdir}${piddir}" "${piddir}"
-	chmod 755 "${named_chrootdir}${piddir}" "${piddir}"
-	chown named:named "${named_chrootdir}${piddir}" "${piddir}"
-	ln -fs "${named_chrootdir}${pidfile}" "${pidfile}"
-
-	#	Change run_rc_commands()'s internal copy of $named_flags
-	#
-	rc_flags="-u named -t ${named_chrootdir} $rc_flags"
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/network

@@ -1,546 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: network,v 1.69 2014/10/14 20:49:47 christos Exp $
-#
-
-# PROVIDE: network
-# REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
-# BEFORE:  NETWORKING
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="network"
-start_cmd="network_start"
-stop_cmd="network_stop"
-
-nl='
-' # a newline
-
-intmissing()
-{
-	local int="$1"
-	shift
-	for i; do
-		if [ "$int" = "$i" ]; then
-			return 1
-		fi
-	done
-	return 0
-}
-
-have_inet6()
-{
-	/sbin/ifconfig lo0 inet6 >/dev/null 2>&1
-}
-
-network_start()
-{
-	# set hostname, turn on network
-	#
-	echo "Starting network."
-
-	network_start_hostname
-	network_start_domainname
-	network_start_loopback
-	have_inet6 &&
-	network_start_ipv6_route
-	[ "$net_interfaces" != NO ] &&
-	network_start_interfaces
-	network_start_aliases
-	network_start_defaultroute
-	network_start_defaultroute6
-	have_inet6 &&
-	network_start_ipv6_autoconf
-	network_start_local
-}
-
-network_start_hostname()
-{
-	# If $hostname is set, use it for my Internet name,
-	# otherwise use /etc/myname
-	#
-	if [ -z "$hostname" ] && [ -f /etc/myname ]; then
-		hostname=$(cat /etc/myname)
-	fi
-	if [ -n "$hostname" ]; then
-		echo "Hostname: $hostname"
-		hostname $hostname
-	else
-		# Don't warn about it if we're going to run
-		# DHCP later, as we will probably get the
-		# hostname at that time.
-		#
-		if ! checkyesno dhclient && ! checkyesno dhcpcd && \
-			[ -z "$(hostname)" ]
-		then
-			warn "\$hostname not set."
-		fi
-	fi
-}
-
-network_start_domainname()
-{
-	# Check $domainname first, then /etc/defaultdomain,
-	# for NIS/YP domain name
-	#
-	if [ -z "$domainname" ] && [ -f /etc/defaultdomain ]; then
-		domainname=$(cat /etc/defaultdomain)
-	fi
-	if [ -n "$domainname" ]; then
-		echo "NIS domainname: $domainname"
-		domainname $domainname
-	fi
-
-	# Flush all routes just to make sure it is clean
-	if checkyesno flushroutes; then
-		/sbin/route -qn flush
-	fi
-}
-
-network_start_loopback()
-{
-	# Set the address for the first loopback interface, so that the
-	# auto-route from a newly configured interface's address to lo0
-	# works correctly.
-	#
-	# NOTE: obscure networking problems will occur if lo0 isn't configured.
-	#
-	/sbin/ifconfig lo0 inet 127.0.0.1
-
-	# According to RFC1122, 127.0.0.0/8 must not leave the node.
-	#
-	/sbin/route -q add -inet 127.0.0.0 -netmask 0xff000000 127.0.0.1 -reject
-}
-
-network_start_ipv6_route()
-{
-	# IPv6 routing setups, and host/router mode selection.
-	#
-	# We have IPv6 support in kernel.
-
-	# disallow link-local unicast dest without outgoing scope
-	# identifiers.
-	#
-	/sbin/route -q add -inet6 fe80:: -prefixlen 10 ::1 -reject
-
-	# disallow the use of the RFC3849 documentation address
-	#
-	/sbin/route -q add -inet6 2001:db8:: -prefixlen 32 ::1 -reject
-
-	# IPv6 site-local scoped address prefix (fec0::/10)
-	# has been deprecated by RFC3879.
-	#
-	if [ -n "$ip6sitelocal" ]; then
-		warn "\$ip6sitelocal is no longer valid"
-	fi
-
-	# disallow "internal" addresses to appear on the wire.
-	#
-	/sbin/route -q add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
-
-	# disallow packets to malicious IPv4 compatible prefix
-	#
-	/sbin/route -q add -inet6 ::224.0.0.0 -prefixlen 100 ::1 -reject
-	/sbin/route -q add -inet6 ::127.0.0.0 -prefixlen 104 ::1 -reject
-	/sbin/route -q add -inet6 ::0.0.0.0 -prefixlen 104 ::1 -reject
-	/sbin/route -q add -inet6 ::255.0.0.0 -prefixlen 104 ::1 -reject
-
-	# disallow packets to malicious 6to4 prefix
-	#
-	/sbin/route -q add -inet6 2002:e000:: -prefixlen 20 ::1 -reject
-	/sbin/route -q add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject
-	/sbin/route -q add -inet6 2002:0000:: -prefixlen 24 ::1 -reject
-	/sbin/route -q add -inet6 2002:ff00:: -prefixlen 24 ::1 -reject
-
-	# Completely disallow packets to IPv4 compatible prefix.
-	# This may conflict with RFC1933 under following circumstances:
-	# (1) An IPv6-only KAME node tries to originate packets to IPv4
-	#     compatible destination.  The KAME node has no IPv4
-	#     compatible support.  Under RFC1933, it should transmit
-	#     native IPv6 packets toward IPv4 compatible destination,
-	#     hoping it would reach a router that forwards the packet
-	#     toward auto-tunnel interface.
-	# (2) An IPv6-only node originates a packet to IPv4 compatible
-	#     destination.  A KAME node is acting as an IPv6 router, and
-	#     asked to forward it.
-	# Due to rare use of IPv4 compatible address, and security
-	# issues with it, we disable it by default.
-	#
-	/sbin/route -q add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
-
-	/sbin/sysctl -qw net.inet6.ip6.forwarding=0
-	/sbin/sysctl -qw net.inet6.ip6.accept_rtadv=0
-
-	case $ip6mode in
-	router)
-		echo 'IPv6 mode: router'
-		/sbin/sysctl -qw net.inet6.ip6.forwarding=1
-
-		# disallow unique-local unicast forwarding without
-		# explicit configuration.
-		if ! checkyesno ip6uniquelocal; then
-			/sbin/route -q add -inet6 fc00:: -prefixlen 7 \
-			    ::1 -reject
-		fi
-		;;
-
-	autohost)
-		echo 'IPv6 mode: autoconfigured host'
-		/sbin/sysctl -qw net.inet6.ip6.accept_rtadv=1
-		;;
-
-	host)	
-		echo 'IPv6 mode: host'
-		;;
-
-	*)	warn "invalid \$ip6mode value "\"$ip6mode\"
-		;;
-
-	esac
-}
-
-network_start_interfaces()
-{
-	# Configure all of the network interfaces listed in $net_interfaces;
-	# if $auto_ifconfig is YES, grab all interfaces from ifconfig.
-	# In the following, "xxN" stands in for interface names, like "le0".
-	#
-	# For any interfaces that has an $ifconfig_xxN variable
-	# associated, we break it into lines using ';' as a separator,
-	# then process it just like the contents of an /etc/ifconfig.xxN
-	# file.
-	#
-	# For each line from the $ifconfig_xxN variable or the
-	# /etc/ifconfig.xxN file, we ignore comments and blank lines,
-	# treat lines beginning with "!" as commands to execute, treat
-	# "dhcp" as a special case to invoke dhcpcd, and for any other
-	# line we run "ifconfig xxN", using each line of the file as the
-	# arguments for a separate "ifconfig" invocation.
-	#
-	# In order to configure an interface reasonably, you at the very least
-	# need to specify "[addr_family] [hostname]" (e.g "inet my.domain.org"),
-	# and probably a netmask (as in "netmask 0xffffffe0"). You will
-	# frequently need to specify a media type, as in "media UTP", for
-	# interface cards with multiple media connections that do not
-	# autoconfigure. See the ifconfig manual page for details.
-	#
-	# Note that /etc/ifconfig.xxN takes multiple lines.  The following
-	# configuration is possible:
-	#	inet 10.1.1.1 netmask 0xffffff00
-	#	inet 10.1.1.2 netmask 0xffffff00 alias
-	#	inet6 2001:db8::1 prefixlen 64 alias
-	#
-	# You can put shell script fragment into /etc/ifconfig.xxN by
-	# starting a line with "!".  Refer to ifconfig.if(5) for details.
-	#
-	ifaces="$(/sbin/ifconfig -l)"
-	if checkyesno auto_ifconfig; then
-		tmp="$ifaces"
-		for cloner in $(/sbin/ifconfig -C); do
-			for int in /etc/ifconfig.${cloner}[0-9]*; do
-				[ ! -f $int ] && break
-				tmp="$tmp ${int##*.}"
-			done
-		done
-	else
-		tmp="$net_interfaces"
-	fi
-	echo -n 'Configuring network interfaces:'
-	for int in $tmp; do
-		eval argslist=\$ifconfig_$int
-
-		# Skip interfaces that do not have explicit
-		# configuration information.  If auto_ifconfig is
-		# false then also warn about such interfaces.
-		#
-		if [ -z "$argslist" ] && ! [ -f /etc/ifconfig.$int ]
-		then
-			if ! checkyesno auto_ifconfig; then
-				echo
-				warn \
-		"/etc/ifconfig.$int missing and ifconfig_$int not set;"
-				warn "interface $int not configured."
-			fi
-			continue
-		fi
-
-		echo -n " $int"
-
-		# Create the interface if necessary.
-		# If the interface did not exist before,
-		# then also resync ipf(4).
-		#
-		if intmissing $int $ifaces; then
-			if /sbin/ifconfig $int create && \
-			   checkyesno ipfilter; then
-				/sbin/ipf -y >/dev/null
-			fi
-		fi
-
-		# If $ifconfig_xxN is empty, then use
-		# /etc/ifconfig.xxN, which we know exists due to
-		# an earlier test.
-		#
-		# If $ifconfig_xxN is non-empty and contains a
-		# newline, then just use it as is.  (This allows
-		# semicolons through unmolested.)
-		#
-		# If $ifconfig_xxN is non-empty and does not
-		# contain a newline, then convert all semicolons
-		# to newlines.
-		#
-		case "$argslist" in
-		'')
-			cat /etc/ifconfig.$int
-			;;
-		*"${nl}"*)
-			echo "$argslist"
-			;;
-		*)
-			(
-				set -o noglob
-				IFS=';'; set -- $argslist
-				#echo >&2 "[$#] [$1] [$2] [$3] [$4]"
-				IFS="$nl"; echo "$*"
-			)
-			;;
-		esac |
-		collapse_backslash_newline |
-		while read -r args; do
-			case "$args" in
-			''|"#"*|create)
-				;;
-			"!"*)
-				# Run arbitrary command in a subshell.
-				( eval "${args#*!}" )
-				;;
-			dhcp)
-				if ! checkyesno dhcpcd; then
-					/sbin/dhcpcd -n \
-						${dhcpcd_flags} $int
-				fi
-				;;
-			*)
-				# Pass args to ifconfig.  Note
-				# that args may contain embedded
-				# shell metacharacters, such as
-				# "ssid 'foo;*>bar'". We eval
-				# one more time so that things
-				# like ssid "Columbia University" work.
-				(
-					set -o noglob
-					eval set -- $args
-					#echo >&2 "[$#] [$1] [$2] [$3]"
-					/sbin/ifconfig $int "$@"
-				)
-				;;
-			esac
-		done
-		configured_interfaces="$configured_interfaces $int"
-	done
-	echo "."
-}
-
-network_start_aliases()
-{
-	echo -n "Adding interface aliases:"
-
-	# Check if each configured interface xxN has an $ifaliases_xxN variable
-	# associated, then configure additional IP addresses for that interface.
-	# The variable contains a list of "address netmask" pairs, with
-	# "netmask" set to "-" if the interface default netmask is to be used.
-	#
-	# Note that $ifaliases_xxN works only in certain cases and its
-	# use is not recommended.  Use /etc/ifconfig.xxN or multiple
-	# commands in $ifconfig_xxN instead.
-	#
-	for int in lo0 $configured_interfaces; do
-		eval args=\$ifaliases_$int
-		if [ -n "$args" ]; then
-			set -- $args
-			while [ $# -ge 2 ]; do
-				addr=$1 ; net=$2 ; shift 2
-				if [ "$net" = "-" ]; then
-					# for compatibility only, obsolete
-					/sbin/ifconfig $int inet alias $addr
-				else
-					/sbin/ifconfig $int inet alias $addr \
-					    netmask $net
-				fi
-				echo -n " $int:$addr"
-			done
-		fi
-	done
-
-	# /etc/ifaliases, if it exists, contains the names of additional IP
-	# addresses for each interface. It is formatted as a series of lines
-	# that contain
-	#	address interface netmask
-	#
-	# Note that /etc/ifaliases works only in certain cases and its
-	# use is not recommended.  Use /etc/ifconfig.xxN or multiple
-	# commands in $ifconfig_xxN instead.
-	#
-	if [ -f /etc/ifaliases ]; then
-		while read addr int net; do
-			if [ -z "$net" ]; then
-				# for compatibility only, obsolete
-				/sbin/ifconfig $int inet alias $addr
-			else
-				/sbin/ifconfig $int inet alias $addr netmask $net
-			fi
-		done < /etc/ifaliases
-	fi
-
-	echo "." # for "Adding interface aliases:"
-}
-
-network_start_defaultroute()
-{
-	# Check $defaultroute, then /etc/mygate, for the name or address
-	# of my IPv4 gateway host. If using a name, that name must be in
-	# /etc/hosts.
-	#
-	if [ -z "$defaultroute" ] && [ -f /etc/mygate ]; then
-		defaultroute=$(cat /etc/mygate)
-	fi
-	if [ -n "$defaultroute" ]; then
-		/sbin/route add default $defaultroute
-	fi
-}
-
-network_start_defaultroute6()
-{
-	# Check $defaultroute6, then /etc/mygate6, for the name or address
-	# of my IPv6 gateway host. If using a name, that name must be in
-	# /etc/hosts.  Note that the gateway host address must be a link-local
-	# address if it is not using an stf* interface.
-	#
-	if [ -z "$defaultroute6" ] && [ -f /etc/mygate6 ]; then
-		defaultroute6=$(cat /etc/mygate6)
-	fi
-	if [ -n "$defaultroute6" ]; then
-		if [ "$ip6mode" = "autohost" ]; then
-			echo
-			warn \
-	    "ip6mode is set to 'autohost' and a v6 default route is also set."
-		fi
-		/sbin/route add -inet6 default $defaultroute6
-	fi
-}
-
-network_start_ipv6_autoconf()
-{
-	# IPv6 interface autoconfiguration.
-
-	dadcount=$(/sbin/sysctl -n net.inet6.ip6.dad_count 2>/dev/null)
-	if [ -n "$dadcount" -a "$dadcount" != 0 ]; then
-		# wait till DAD is completed
-		echo 'Waiting for DAD to complete for' \
-		    'statically configured addresses...'
-		# Add 1 for MAX_RTR_SOLICITATION_DELAY and another
-		# to give time for the last DAD packet to respond and
-		# a few more for luck.
-		waitsecs=$((dadcount + 4))
-		/sbin/ifconfig -w $waitsecs
-	fi
-
-	# dhcpcd will ensure DAD completes before forking
-	if checkyesnox rtsol && ! checkyesno dhcpcd; then
-		if [ "$ip6mode" = "autohost" ]; then
-			echo
-			warn "rtsol has been removed, " \
-			    "please configure dhcpcd in its place."
-		fi
-	fi
-}
-
-network_start_local()
-{
-	# XXX this must die
-	if [ -s /etc/netstart.local ]; then
-		sh /etc/netstart.local start
-	fi
-}
-
-network_stop()
-{
-	echo "Stopping network."
-
-	network_stop_local
-	network_stop_aliases
-	[ "$net_interfaces" != NO ] &&
-	network_stop_interfaces
-	network_stop_route
-}
-
-network_stop_local()
-{
-	# XXX this must die
-	if [ -s /etc/netstart.local ]; then
-		sh /etc/netstart.local stop
-	fi
-}
-
-network_stop_aliases()
-{
-	echo "Deleting aliases."
-	if [ -f /etc/ifaliases ]; then
-		while read addr int net; do
-			/sbin/ifconfig $int inet delete $addr
-		done < /etc/ifaliases
-	fi
-
-	for int in $(/sbin/ifconfig -lu); do
-		eval args=\$ifaliases_$int
-		if [ -n "$args" ]; then
-			set -- $args
-			while [ $# -ge 2 ]; do
-				addr=$1 ; net=$2 ; shift 2
-				/sbin/ifconfig $int inet delete $addr
-			done
-		fi
-	done
-}
-
-network_stop_interfaces()
-{
-	# down interfaces
-	#
-	echo -n 'Downing network interfaces:'
-	if checkyesno auto_ifconfig; then
-		tmp=$(/sbin/ifconfig -l)
-	else
-		tmp="$net_interfaces"
-	fi
-	for int in $tmp; do
-		eval args=\$ifconfig_$int
-		if [ -n "$args" ] || [ -f /etc/ifconfig.$int ]; then
-			echo -n " $int"
-			if [ -f /var/run/dhcpcd-$int.pid ]; then
-				/sbin/dhcpcd -k $int 2> /dev/null
-			fi
-			/sbin/ifconfig $int down
-			if /sbin/ifconfig $int destroy 2>/dev/null && \
-			   checkyesno ipfilter; then
-				# resync ipf(4)
-				/sbin/ipf -y >/dev/null
-			fi
-		fi
-	done
-	echo "."
-}
-
-network_stop_route()
-{
-	# flush routes
-	#
-	/sbin/route -qn flush
-
-}
-
-load_rc_config $name
-load_rc_config_var dhclient dhclient
-load_rc_config_var dhcpcd dhcpcd
-load_rc_config_var ipfilter ipfilter
-run_rc_command "$1"

etc/rc.d/npf

@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: npf,v 1.3 2012/11/01 06:06:14 mrg Exp $
-#
-# Public Domain.
-#
-
-# PROVIDE: npf
-# REQUIRE: root bootconf mountcritlocal tty network
-# BEFORE: NETWORKING
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="npf"
-rcvar=$name
-
-config="/etc/npf.conf"
-
-start_cmd="npf_start"
-stop_cmd="npf_stop"
-
-reload_cmd="npf_reload"
-status_cmd="npf_status"
-extra_commands="reload status"
-
-npf_cfg_check()
-{
-	if [ ! -f ${config} ]; then
-		warn "${config} is not readable; failed."
-		exit 1	
-	fi
-}
-
-npf_start()
-{
-	echo "Enabling NPF."
-	npf_cfg_check
-	/sbin/npfctl reload
-	/sbin/npfctl start
-}
-
-npf_stop()
-{
-	echo "Disabling NPF."
-	/sbin/npfctl stop
-	/sbin/npfctl flush
-}
-
-npf_reload()
-{
-	echo "Reloading NPF ruleset."
-	npf_cfg_check
-	/sbin/npfctl reload
-}
-
-npf_status()
-{
-	:
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/pwcheck

@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: pwcheck,v 1.5 2004/08/13 18:08:03 mycroft Exp $
-#
-
-# PROVIDE: pwcheck
-# REQUIRE: mountcritremote syslogd
-# BEFORE:  DAEMON
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="pwcheck"
-start_cmd="pwcheck_start"
-stop_cmd=":"
-
-pwcheck_start()
-{
-	#	check the password temp/lock file
-	#
-	if [ -f /etc/ptmp ]; then
-		logger -s -p auth.err \
-		    "password file may be incorrect -- /etc/ptmp exists"
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/root

@@ -1,4 +0,0 @@
-#!/bin/sh
-# MINIX 3 stub.
-
-# PROVIDE: root

etc/rc.d/rtadvd

@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: rtadvd,v 1.8 2013/07/09 09:34:58 roy Exp $
-#
-
-# PROVIDE: rtadvd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name=rtadvd
-rcvar=$name
-command="/usr/sbin/$name"
-pidfile="/var/run/$name.pid"
-extra_commands=reload
-start_precmd=rtadvd_prestart
-reload_precmd=rtadvd_prereload
-
-rtadvd_prereload()
-{
-	local chdir="$(getent passwd _rtadvd | cut -d: -f6)"
-	local conf=/etc/rtadvd.conf myflags o confdir
-	
-	[ -z "$chdir" -o "$chdir" = / ] && return 0
-
-	if [ -n "$flags" ]; then
-		myflags=$flags
-	else
-		eval myflags=\$${name}_flags
-	fi
-	set -- ${myflags}
-	while getopts c:dDfM:Rs o; do
-		case "$1" in
-		-c)	conf="$OPTARG";;
-		esac
-		shift
-	done
-	confdir=$(dirname "$conf")
-	
-	echo "$name: copying $conf to $chdir$conf"
-	cp "$conf" "$chdir$conf"
-
-	# Provide a link to the chrooted dump file
-	ln -snf "$chdir/var/run/$name.dump" /var/run
-}
-
-rtadvd_prestart()
-{
-	if [ "$ip6mode" != router ]; then
-		warn \
-	"${name} cannot be used on IPv6 host, only on an IPv6 router."
-		return 1
-	fi
-
-	rtadvd_prereload
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/staticroute

@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: staticroute,v 1.6 2012/05/02 15:57:15 gendalia Exp $
-#
-
-# PROVIDE: staticroute
-# REQUIRE: network
-# BEFORE:  NETWORKING
-
-# See the route.conf(5) manual page for details.
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="staticroute"
-start_cmd="staticroute_doit Adding add"
-stop_cmd="staticroute_doit Deleting delete"
-
-staticroute_doit() {
-	retval=0
-
-	if [ -s /etc/route.conf ]; then
-		echo "$1 static routes."
-		( while read args; do
-			[ -z "$args" ] && continue
-			case "$args" in
-			"#"*)
-				;;
-			"+"*)
-				if [ $2 = "add" ]; then
-					eval "${args#*+}" || retval=1
-				fi
-				;;
-			"-"*)
-				if [ $2 = "delete" ]; then
-					eval "${args#*-}" || retval=1
-				fi
-				;;
-			"!"*)
-				eval "${args#*!}" || retval=1
-				;;
-			*)
-				eval "route -q $2 -$args" || retval=1
-				;;
-			esac
-		done < /etc/route.conf )
-	fi
-
-	return $retval
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/sysctl

@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: sysctl,v 1.13 2004/08/13 18:08:03 mycroft Exp $
-#
-
-# PROVIDE: sysctl
-# REQUIRE: root ipfilter ipsec
-# BEFORE:  DAEMON
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="sysctl"
-start_cmd="sysctl_start"
-stop_cmd=":"
-
-sysctl_start()
-{
-	if [ -r /etc/sysctl.conf ]; then
-		echo "Setting sysctl variables:"
-		sysctl -f /etc/sysctl.conf
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/sysdb

@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: sysdb,v 1.24 2012/06/03 21:42:45 joerg Exp $
-#
-
-# PROVIDE: sysdb
-# REQUIRE: mountcritremote
-# BEFORE:  DAEMON
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="sysdb"
-rcvar=$name
-start_cmd="sysdb_start"
-stop_cmd=":"
-extra_commands="devdb utmp services netgroup password"
-devdb_cmd="build_devdb"
-utmp_cmd="build_utmp"
-services_cmd="build_services"
-netgroup_cmd="build_netgroup"
-password_cmd="build_password"
-echo=:
-
-sysdb_start()
-{
-	echo -n "Building databases:"
-	echo=echo
-	comma=" "
-	$devdb_cmd
-	$utmp_cmd
-	$services_cmd
-	$netgroup_cmd
-	$password_cmd
-	echo "."
-}
-
-check_file()
-{
-	local src="$1"
-	local db="$2"
-
-	shift 2
-	if [ ! -e "$src" ]; then
-		return
-	fi
-	if [ \( ! -f "$db" \) -o \( "$src" -nt "$db" \) ]; then
-		$echo -n "$comma$(basename "$src")"
-		comma=", "
-		"$@"
-	fi
-}
-
-build_services()
-{
-	check_file /etc/services /var/db/services.cdb services_mkdb -q
-}
-
-build_netgroup()
-{
-	check_file /etc/netgroup /var/db/netgroup.db netgroup_mkdb
-}
-
-build_devdb()
-{
-	check_file /dev /var/run/dev.db dev_mkdb
-	check_file /dev /var/run/dev.cdb dev_mkdb
-}
-
-build_password()
-{
-	local p=/etc/master.passwd
-	check_file $p /etc/spwd.db pwd_mkdb -w $p
-}
-
-build_utmp()
-{
-	#	Re-create /var/run/utmp and /var/run/utmpx, which are
-	#	deleted by mountcritlocal but can't be recreated by it
-	#	because install and chown may not be available then
-	#	(possibly no /usr).
-	#
-	local i
-	for i in "" x; do
-		if [ ! -f /var/run/utmp$i ]; then
-			$echo -n "${comma}utmp$i"
-			comma=", "
-			install -c -m 664 -g utmp /dev/null /var/run/utmp$i
-		fi
-	done
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/syslogd

@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: syslogd,v 1.15 2004/10/11 13:29:52 lukem Exp $
-#
-
-# PROVIDE: syslogd
-# REQUIRE: mountcritremote sysdb wscons
-# BEFORE:  SERVERS
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="syslogd"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/syslog.conf"
-start_precmd="syslogd_precmd"
-extra_commands="reload"
-
-_sockfile="/var/run/syslogd.sockets"
-
-syslogd_precmd()
-{
-	#	Transitional symlink for old binaries
-	#
-	# MINIX 3: unsupported, disabled
-	#if [ ! -h /dev/log ]; then
-	#	ln -sf /var/run/log /dev/log
-	#fi
-	# MINIX 3: end
-
-	#	Create default list of syslog sockets to watch
-	#
-	( umask 022 ; > $_sockfile )
-
-	#	Find /etc/rc.d scripts with "chrootdir" rcorder(8) keyword,
-	#	and if $${app}_chrootdir is a directory, add appropriate
-	#	syslog socket to list of sockets to watch.
-	#
-	for _lr in $(rcorder -k chrootdir /etc/rc.d/*); do
-	    (
-		_l=${_lr##*/}
-		load_rc_config ${_l}
-		eval _ldir=\$${_l}_chrootdir
-		if checkyesno $_l && [ -n "$_ldir" ]; then
-			echo "${_ldir}/var/run/log" >> $_sockfile
-		fi
-	    )
-	done
-
-	#	If other sockets have been provided, change run_rc_command()'s
-	#	internal copy of $syslogd_flags to force use of specific
-	#	syslogd sockets.
-	#
-	if [ -s $_sockfile ]; then
-		echo "/var/run/log" >> $_sockfile
-		rc_flags="-P $_sockfile $rc_flags"
-	fi
-
-	return 0
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.d/ttys

@@ -1,8 +0,0 @@
-#!/bin/sh
-# MINIX 3 stub.
-# There is currently nothing in the NetBSD script that we want: setting tty
-# flags is not yet a supported concept, and changing /dev/tty permissions does
-# not work from the installation CD with its read-only /dev directory.
-
-# PROVIDE: tty
-# REQUIRE: root bootconf

etc/rc.d/wscons

@@ -1,186 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: wscons,v 1.13 2011/08/09 08:08:10 mbalmer Exp $
-#
-
-# PROVIDE: wscons
-# REQUIRE: mountcritremote
-# BEFORE:  LOGIN
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="wscons"
-rcvar=$name
-start_cmd="wscons_start"
-stop_cmd=":"
-
-wscons_start()
-{
-	wscfg=/usr/sbin/wsconscfg
-	wsfld=/usr/sbin/wsfontload
-	wsctl=/sbin/wsconsctl
-	config=/etc/wscons.conf
-	usage="Usage: wsconfig [-n] [-f configfile] [-font fontpgm] [-screen screenpgm]"
-	DOIT=
-
-	while [ $# -gt 0 ]; do
-		case $1 in
-			-n)
-				DOIT=echo
-				;;
-			-f)
-				config=$2
-				shift
-				;;
-			-font)
-				wsfld=$2
-				shift
-				;;
-			-screen)
-				wscfg=$2
-				shift
-				;;
-			*)
-				echo $usage
-				exit 1
-				;;
-		esac
-		shift
-	done
-
-
-	# args mean:
-	#	screen idx scr emul
-	#	font   name width height enc file
-	( while read type arg1 arg2 arg3 arg4 arg5; do
-		case "$type" in
-			\#*|"")
-				continue
-				;;
-
-			font)
-				name=$arg1
-				width=$arg2
-				height=$arg3
-				enc=$arg4
-				file=$arg5
-				cmd=$wsfld
-
-				case $width in
-					-)
-						;;
-					*)
-						cmd="$cmd -w $width"
-						;;
-				esac
-				case $height in
-					-)
-						;;
-					*)
-						cmd="$cmd -h $height"
-						;;
-				esac
-				case $enc in
-					-)
-						;;
-					*)
-						cmd="$cmd -e $enc"
-						;;
-				esac
-				cmd="$cmd -N $name $file"
-				eval $DOIT $cmd
-				;;
-
-			screen)
-				idx=$arg1
-				scr=$arg2
-				emul=$arg3
-				cmd=$wscfg
-
-				case $scr in
-					-)
-						;;
-					*)
-						cmd="$cmd -t $scr"
-						;;
-				esac
-				case $emul in
-					-)
-						;;
-					*)
-						cmd="$cmd -e $emul"
-						;;
-				esac
-				cmd="$cmd $idx"
-				eval $DOIT $cmd
-				;;
-
-			keyboard)
-				kbd=$arg1
-				cmd=$wscfg
-				case $kbd in
-					-|auto)
-						cmd="$cmd -k"
-						;;
-					*)
-						cmd="$cmd -k $kbd"
-						;;
-				esac
-				eval $DOIT $cmd
-				;;
-
-			encoding)
-				map=$arg1
-				cmd="$wsctl -w \"encoding=$map\""
-				echo -n 'Keyboard '
-				eval $DOIT $cmd
-				;;
-
-			mapfile)
-				mapfile=$arg1
-				( while read entry; do
-				    case "$entry" in
-					\#*|"")
-					    continue
-					    ;;
-					*)
-					    cmd="$wsctl -w \"map+=$entry\""
-					    cmd="$cmd >/dev/null"
-					    eval $DOIT $cmd
-					    ;;
-				    esac
-				done ) < $mapfile
-				;;
-
-			mux)
-				cmd="$wscfg -m $arg1"
-				eval $DOIT $cmd
-				;;
-
-			setvar)
-				dev=$arg1
-				var=$arg2
-				val=$arg3
-
-				case $dev in
-				    ttyE*)
-					cmdmod="-d"
-					;;
-				    wskbd*)
-					cmdmod="-k"
-					;;
-				    wsmouse*)
-					cmdmod="-m"
-					;;
-				esac
-				echo -n "$dev: "
-				cmd="$wsctl -f /dev/$dev $cmdmod -w $var=$val"
-				eval $DOIT $cmd
-				;;
-
-		esac
-	done ) < $config
-}
-
-load_rc_config $name
-run_rc_command "$1"

etc/rc.daemons.dist

@@ -0,0 +1,5 @@
+daemonize talkd
+daemonize tcpd shell /usr/libexec/rshd
+daemonize tcpd telnet in.telnetd
+daemonize tcpd ftp /usr/libexec/ftpd
+daemonize tcpd finger /usr/libexec/fingerd

etc/rc.minix

@@ -1,239 +0,0 @@
-# /etc/rc.minix - MINIX system startup script
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-# The normal system boot situation is that init(8) invokes the ramdisk RC
-# script, which invokes the NetBSD rc infrastructure, which in turn calls this
-# script through /etc/rc.d/minixrc.  With a boot ramdisk (x86_ramimage), the
-# ramdisk RC is bypassed altogether, but stored as /etc/rc.ramdisk.  We then
-# have to invoke it here (for startup only!) to let it perform its tasks first.
-if sysenv bootramdisk >/dev/null
-then
-	[ "$1" = "start" ] && sh /etc/rc.ramdisk "$@"
-fi
-
-# Same settings as in the default /etc/profile. We do not source this file
-# as the system administrator may decide to change those values for his users.
-RC_TZ=/etc/rc.timezone
-
-# Are we booting from CD?
-bootcd="`/bin/sysenv bootcd`"
-
-# Set TERM to minix if not present.
-TERM="${TERM-minix}"
-
-export TERM PATH
-
-# Local variables
-ARCH="`sysenv arch`"
-
-usage()
-{
-    echo >&2 "Usage: $0 [-saf] [start|stop]"
-    exec intr sh
-}
-
-up()
-{
-    # Function to dynamically start a system service
-    opt=""
-    prefix=$(expr "$1 " : '\(-\)')
-    if [ "$prefix" = "-" ];
-    then
-         opt=$1
-         shift
-    fi
-    service=$1
-    shift
-
-    minix-service $opt up /service/$service "$@"
-}
-
-edit()
-{
-    # Function to dynamically edit system service settings
-    opt=""
-    prefix=$(expr "$1 " : '\(-\)')
-    if [ "$prefix" = "-" ];
-    then
-         opt=$1
-         shift
-    fi
-    service=$1
-    shift
-
-    # Assume binaries are always in /service or /usr/pkg/service
-    binlocation=/service/$service
-    if [ ! -x $binlocation ]
-    then	binlocation=/usr/pkg/service/$service
-    fi
-
-    # Mostly to find init...
-    if [ ! -x $binlocation ]
-    then	binlocation=/sbin/$service
-    fi
-    minix-service $opt edit $binlocation -label $service "$@"
-}
-
-set -- `sysenv bootopt` "$@"
-while getopts 'saf' opt
-do
-    case $opt in
-    s)	sflag=t ;;	# Single user
-    a)	aflag=t ;;	# Ask for /usr
-    f)	fflag=-f ;;	# Force a full file system check
-    *)	usage
-    esac
-done
-shift `expr $OPTIND - 1`
-
-case "$#:$1" in
-1:start|1:stop)
-    action=$1
-    ;;
-*)  usage
-esac
-
-case $action in
-start)
-    # If booting from CD, we want some directories to be ramdisks
-    if [ ! -z "$bootcd" ]
-    then
-	. /etc/rc.cd
-    fi
-
-    # National keyboard?
-    test -f /etc/keymap && loadkeys /etc/keymap
-
-    # options for fsck. default is -r, which prompts the user for repairs.
-    optname=fsckopts
-    fsckopts=-p
-    if sysenv $optname >/dev/null
-    then       fsckopts="`sysenv $optname`"
-    fi
-
-    if [ "`sysenv debug_fkeys`" != 0 ]
-    then
-        up -n is -period 5HZ
-    fi
-
-    # Set timezone.
-    export TZ=GMT0
-    if [ -f "$RC_TZ" ]
-    then
-         . "$RC_TZ"
-    fi
-
-    # Start real time clock driver & set system time, otherwise default date.
-    up readclock.drv
-    readclock -q || date 201301010000
-
-    # We are not shutting down.
-    if [ -f /etc/nologin ]
-    then
-        rm -f /etc/nologin
-    fi
-
-    # Use MFS binary only from kernel image?
-    if [ "`sysenv bin_img`" = 1 ]
-    then
-        bin_img="-i "
-    fi
-
-    # fsck + mount using /etc/fstab.
-    fsck -x / $fflag $fsckopts
-    mount -a
-
-    if [ -z "`sysenv bootramdisk`" ]
-    then
-	# Unmount and free now defunct ramdisk
-	umount /dev/imgrd > /dev/null || echo "Failed to unmount boot ramdisk"
-	ramdisk 0 /dev/imgrd || echo "Failed to free boot ramdisk"
-    fi
-
-    # Initialize files.
-    >/var/run/utmp				# /etc/utmp keeps track of logins
-    >/var/run/utmpx				# /etc/utmpx keeps track of logins
-
-    # Edit settings for boot system services
-    if [ "`sysenv skip_boot_config`" != 1 ]
-    then
-	edit rs
-	edit vm
-	edit pm
-	edit sched
-	edit vfs
-	edit ds
-	edit tty
-	edit memory
-	edit mib
-	edit pfs
-	edit init
-	#
-	# Keep a copy around to recover the root FS from crashes
-	#
-	rootline=`cat /etc/mtab | grep "on / "`
-	rootfs=fs_`echo "$rootline" | cut -d' ' -f1 | cut -d'/' -f3`
-	[ "$rootfs" = "fs_bootramdisk" ] && rootfs=fs_imgrd
-	roottype=`echo "$rootline" | cut -d' ' -f5`
-	minix-service -c edit /service/$roottype -label $rootfs
-    fi
-
-    if [ "$sflag" ]
-    then
-	echo "Single user. Press ^D to resume multiuser startup."
-	intr sh
-	echo
-    fi
-
-    echo "Multiuser startup in progress ..."
-
-    case "`printroot -r`":$bootcd in
-    /dev/ram:)
-	# Remove boot-only things to make space,
-	# unless booting from CD, in which case we need them.
-	rm -rf /boot
-	# put the compiler on ram
-	cp /usr/lib/em* /usr/lib/cpp* /lib
-    esac
-
-    echo -n "Starting hotplugging infrastructure... "
-    rm -f /var/run/devmand.pid
-    devmand -d /etc/devmand -d /usr/pkg/etc/devmand &
-    echo "done."
-
-    # Things should be alright now.
-    ;;
-stop)
-    sync
-    if [ -f /var/run/devmand.pid ]
-    then
-	kill -INT `cat /var/run/devmand.pid`
-	# without this delay the following will
-	# be printed in the console
-	# RS: devman not running?
-	sleep 1
-    fi
-
-    if [ -x /service/usbd ]
-    then
-	minix-service down usbd
-    fi
-
-    # Tell RS server we're going down.
-    minix-service shutdown
-    ;;
-esac
-
-# Further initialization.
-test -f /usr/etc/rc && sh /usr/etc/rc $action
-test -f /usr/local/etc/rc && sh /usr/local/etc/rc $action
-
-# Any messages?
-if [ "$action" = start ]
-then	if [ -f /etc/issue ]
-	then	cat /etc/issue
-	fi
-fi
-
-exit 0

etc/rc.shutdown

@@ -1,66 +1,3 @@
 #!/bin/sh
-#
-# $NetBSD: rc.shutdown,v 1.9 2012/06/25 07:22:45 jnemeth Exp $
-#
-# rc.shutdown --
-#	Run the scripts in /etc/rc.d with reverse rcorder.
 
-#	System shutdown script run by shutdown(8) at system shutdown time.
+sh /etc/rc stop
-#	Note that halt(8) and reboot(8) do NOT invoke this script.
-
-export HOME=/
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-. /etc/rc.subr
-. /etc/rc.conf
-
-if ! checkyesno do_rcshutdown; then
-	echo "Skipping shutdown hooks."
-	exit 0
-fi
-
-stty status '^T'
-
-#	Set shell to ignore SIGINT, but not children;
-#	shell catches SIGQUIT and returns to single user.
-#
-trap : INT
-trap "echo 'Shutdown interrupted.'; exit 1" QUIT
-
-#	If requested, start a watchdog timer in the background which
-#	will terminate rc.shutdown if rc.shutdown doesn't complete
-#	within the specified time.
-#
-_rcshutdown_watchdog=
-if [ -n "$rcshutdown_timeout" ]; then
-	sleep $rcshutdown_timeout && (
-	    _msg="$rcshutdown_timeout second watchdog timeout expired. Shutdown terminated."
-	    logger -t rc.shutdown "$_msg"
-	    echo "$_msg"
-	    date
-	    kill -KILL $$ >/dev/null 2>&1
-	    ) &
-	_rcshutdown_watchdog=$!
-fi
-
-
-#	Determine the shutdown order of the rc.d scripts,
-#	and perform the operation
-#
-scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
-	test -d ${rcd} && echo ${rcd}/*; done)
-files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} ${scripts})
-
-for _rc_elem in $(reverse_list $files); do
-	run_rc_script $_rc_elem stop
-done
-
-
-#	Terminate the background watchdog timer (if it is running)
-#
-if [ -n "$_rcshutdown_watchdog" ]; then
-	kill -TERM $_rcshutdown_watchdog >/dev/null 2>&1
-fi
-
-date
-exit 0

etc/rc.subr

@@ -1053,13 +1053,13 @@ backup_file()
 			ci -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
 			rcs -q -kb -U $_cur
 			co -q -f -u $_cur
-			chown root:wheel $_cur $_cur,v
+			chown root:operator $_cur $_cur,v
 			;;
 		remove)
 			cp /dev/null $_cur
 			ci -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
 			rcs -q -kb -U $_cur
-			chown root:wheel $_cur $_cur,v
+			chown root:operator $_cur $_cur,v
 			rm $_cur
 			;;
 		esac
@@ -1070,7 +1070,7 @@ backup_file()
 				cp -p $_cur $_back
 			fi
 			cp -p $_file $_cur
-			chown root:wheel $_cur
+			chown root:operator $_cur
 			;;
 		remove)
 			mv -f $_cur $_back

etc/resolv.conf

@@ -0,0 +1,2 @@
+# Use Minix nonamed for now
+nameserver 127.0.0.1

etc/rs.inet

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Recovery script for INET/lwip. It restarts daemons dependent on it in order
+# to recover TCP state.
+
+kill_by_name()
+{
+	label="$1"
+	pid=`ps ax | grep "$label" | grep -v grep | sed 's,[ 	]*\([0-9]*\).*,\1,'`
+	if [ X"$pid" = X ]
+	then
+		return 1	# No such process
+	fi
+	echo "killing pid $pid for $label"
+	kill -9 $pid
+}
+
+daemonize()
+{
+    # Function to start a daemon, if it exists.
+    local IFS=':'
+    local name="$1"
+    test "$1" = tcpd && name="$2"
+
+    for dir in $PATH
+    do
+	if [ -f "$dir/$1" ]
+	then
+
+            # check if this service is disabled at the boot monitor.
+            if disabled $name; then return; fi
+
+	    echo -n " $name"
+	    "$@" &
+	    return
+	fi
+    done
+}
+
+disabled()
+{
+    ifs="$IFS"; IFS=,
+    for skip in `sysenv disable`
+    do 
+        if [ "$skip" = "$1" ]
+	then 	 
+                IFS="$ifs"; unset ifs
+		return 0
+	fi
+    done
+    IFS="$ifs"; unset ifs
+    return 1
+}
+
+exec > /dev/console
+echo "Arguments: $@"
+
+restarts=$(grep restarts /proc/service/$1 |cut -d: -f2)
+restarts=$(( $restarts + 1 ))
+service down "$1"
+kill_by_name dhcpd
+kill_by_name nonamed
+kill_by_name syslogd
+
+# Wait a moment to let daemons clean themselves up
+sleep 3
+if [ X`/bin/sysenv lwip` = Xyes ]
+then
+	service up /service/lwip -script /etc/rs.inet -dev /dev/ip -restarts $restarts
+	dhcpd --lwip &
+else
+	service up /service/inet -script /etc/rs.inet -dev /dev/ip -restarts $restarts
+	daemonize dhcpd
+fi
+daemonize nonamed -L
+daemonize syslogd
+
+# Restart SSH daemon if installed and running
+if [ -f /usr/pkg/etc/rc.d/sshd ]
+then
+	/usr/pkg/etc/rc.d/sshd status | grep -v not > /dev/null
+	if [ $? -eq 0 ]
+	then
+		/usr/pkg/etc/rc.d/sshd restart
+	fi
+fi

etc/rs.lwip

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# Recovery script for LWIP.  Aside from restarting the LWIP service itself, the
-# script aims to restart all of networking.  This includes in particular any
-# network daemons: these daemons typically have open (listening) sockets that
-# will now have become invalid, and the daemons typically do not know how to
-# deal with that.  Unfortunately, there is no reliable way to determine the
-# list of rc scripts that concern network daemons, so for now we hardcode a
-# list of known ones here: this is the list of network-related rc.d scripts.
-# FIXME: since we are not yet done importing etc/rc.d from NetBSD, this list is
-# still incomplete and should be extended as more scripts are imported!
-RC_SCRIPTS="dhclient dhcpcd dhcpd dhcrelay ftpd inetd named network rtadvd \
-    sshd staticroute syslogd"
-
-exec < /dev/console
-exec > /dev/console
-exec 2> /dev/console
-
-export HOME=/
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-. /etc/rc.subr
-. /etc/rc.conf
-
-# Restart the LWIP service.
-
-# There is no need to shut down daemons before bringing back up the service.
-# Note that "minix-service restart" does not do the same as these steps, and in
-# fact breaks a proper LWIP restart.
-restarts=$(grep restarts /proc/service/$1 | cut -d: -f2)
-minix-service down "$1"
-minix-service up /service/lwip -dev /dev/bpf -script /etc/rs.lwip \
-    -restarts $(($restarts + 1))
-
-# Reload TCP ISN, or make a new one if there is none.  Do not save anything.
-TCPISN_FILE=/usr/adm/tcpisn.dat
-TCPISN_LEN=$(sysctl -n net.inet.tcp.isn_secret | awk '{print length/2}')
-if [ ! -f $TCPISN_FILE ]; then TCPISN_FILE=/dev/random; fi
-sysctl -qw net.inet.tcp.isn_secret=`dd if=$TCPISN_FILE bs=$TCPISN_LEN \
-    count=1 2>/dev/null | hexdump -v -e '/1 "%02x"'` 2>/dev/null
-
-# Let LWIP find all network drivers before performing initialization.
-sleep 1
-
-# Restart all network daemons.
-
-# Start with dhcpcd, which may be launched directly from ifconfig.if(5) scripts
-# and therefore may not be enabled in, and thus stopped by, rc.d scripts below.
-service dhcpcd onestop >/dev/null 2>&1
-
-# Then stop and start all known network daemons using their rc.d scripts.
-regex='/('"$(echo $RC_SCRIPTS | tr ' ' '|')"')$'
-scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
-	test -d ${rcd} && echo ${rcd}/*; done)
-files=$(rcorder ${scripts} | grep -E "$regex")
-
-for _rc_elem in $(reverse_list $files); do
-	# We have already stopped dhcpcd if it was running, so skip it here.
-	[ $_rc_elem != /etc/rc.d/dhcpcd ] && run_rc_script $_rc_elem stop
-done
-
-for _rc_elem in $files; do
-	run_rc_script $_rc_elem start
-done

etc/rs.single

@@ -3,4 +3,4 @@
 # 'Recovery' script that doesn't. This script is to be used for drivers that
 # should not be restarted. Instead, the scripts configures the driver 'down'.
 #echo "Arguments: $@" >/dev/console
-/sbin/minix-service down "$1"
+service down "$1"

etc/system.conf

@@ -168,6 +168,7 @@ service tty
 		VIRCOPY		# 15
 		PHYSCOPY	# 16
 		IRQCTL		# 19
+		INT86		# 20
 		DEVIO		# 21
 		SDEVIO		# 22
 		VDEVIO		# 23
@@ -193,6 +194,7 @@ service memory
 		VIRCOPY		# 15
 		PHYSCOPY	# 16
 		IRQCTL		# 19
+		INT86		# 20
 		DEVIO		# 21
 		SDEVIO		# 22
 		VDEVIO		# 23
@@ -225,14 +227,14 @@ service mib
 service init
 {
 	uid     0;
-	ipc			# ipc targets allowed:
+	ipc				# ipc targets allowed:
 		pm vfs rs vm
 		;
-	system	NONE;		# No kernel calls allowed
+	system	NONE;	# No kernel calls allowed
 	vm	BASIC;		# Only basic VM calls allowed
 	io	NONE;		# No I/O range allowed
 	irq	NONE;		# No IRQs allowed
-	sigmgr          pm;	# Signal manager is PM
+	sigmgr  pm;		# Signal manager is PM
 };
 
 #
@@ -325,9 +327,9 @@ service virtio_blk
 service at_wini
 {
 	io	1f0:8		# Controller 0
-		3f6		# Also controller 0
+		3f6			# Also controller 0
 		170:8		# Controller 1
-		376		# Also controller 1
+		376			# Also controller 1
 	;
 	irq
 		14		# Controller 0
@@ -428,17 +430,30 @@ service devman
 	;
 };
 
-service mmc
+service omap_mmc
 {
 	system
 		PRIVCTL		#  4
-		IRQCTL          # 19
+		IRQCTL		# 19
 	;
 	# Interrupts allowed
 	irq
 		64
 		83
-	;		# IRQs allowed
+	;				# IRQs allowed
+	priority	 4;	# priority queue 4
+};
+
+service rpi_mmc
+{
+	system
+		PRIVCTL		#  4
+		IRQCTL		# 19
+	;
+	# Interrupts allowed
+	irq
+		126
+	;				# IRQs allowed
 	priority	 4;	# priority queue 4
 };
 
@@ -446,11 +461,11 @@ service fb
 {
 	system
 		UMAP		# 14
-                DEVIO           # 21
+		DEVIO		# 21
 		PRIVCTL		#  4
         ;
 	ipc
-                SYSTEM pm rs ds vm vfs cat24c256 tda19988
+		SYSTEM pm rs ds vm vfs cat24c256 tda19988
 	;
 };
 
@@ -494,10 +509,18 @@ service vnd
 	uid	0;	# only for copyfd(2)
 };
 
+service uds
+{
+	ipc
+		SYSTEM vfs rs vm
+	;
+	uid	0;	# only for checkperms(2) and copyfd(2)
+};
+
 service pty
 {
 	system
-		KILL		# 06
+		KILL	# 06
 	;
 	ipc
 		SYSTEM vfs rs vm
@@ -516,7 +539,7 @@ service edfictl
         ipc ALL;
 };
 
-service emmc
+service omap_emmc
 {
 	system
 		PRIVCTL
@@ -527,3 +550,39 @@ service emmc
 		28	# MMCSD1INT
 	;
 };
+
+service mailbox
+{
+	system
+		UMAP		# 14
+		PRIVCTL		#  4
+		IRQCTL		# 19
+	;
+	irq
+		33
+	;
+	ipc ALL
+};
+
+service i2c
+{
+	system
+		PRIVCTL			#  4
+		IRQCTL 			# 19
+		PADCONF			# 57
+	;
+	irq
+		# DM37XX (BeagleBoard-xM)
+		56		# I2C module 1
+		57		# I2C module 2
+		61		# I2C module 3
+		# AM335X (BeagleBone)
+		70		# I2C module 1
+		71		# I2C module 2
+		30		# I2C module 3
+		# BCM283X (RaspberryPi 2,3)
+		47
+	;
+	ipc SYSTEM rs ds vm
+	;
+};

etc/usr/dhcptags.conf

@@ -0,0 +1,63 @@
+# A list of all tags mentioned in RFC-1533.
+
+tag 1 netmask ip 1 1;
+tag 2 zoneoffset number 4 1;
+tag 3 gateway ip 1 0;
+tag 4 timeserver ip 1 0;
+tag 5 nameserver ip 1 0;
+tag 6 DNSserver ip 1 0;
+tag 7 logserver ip 1 0;
+tag 8 cookieserver ip 1 0;
+tag 9 LPR ip 1 0;
+tag 10 impress ip 1 0;
+tag 11 resource ip 1 0;
+tag 12 hostname ascii 1 0;
+tag 13 bootfilesize number 2 1;
+tag 14 coredump ip 1 0;
+tag 15 domain ascii 1 0;
+tag 16 swapserver ip 1 1;
+tag 17 rootpath ascii 1 0;
+tag 18 extensions ascii 1 0;
+tag 19 IPforwarding boolean 1 1;
+tag 20 IPnonlocalsource boolean 1 1;
+tag 21 IPpolicyfilter ip 2 0;
+tag 22 IPmaxreassembly number 2 1;
+tag 23 IPTTL number 1 1;
+tag 24 IPMTUaging number 4 1;
+tag 25 IPMTUplateau number 2 0;
+tag 26 IPMTU number 2 1;
+tag 27 IPsublocal boolean 1 1;
+tag 28 IPbroadcast ip 1 1;
+tag 29 IPmaskdiscovery boolean 1 1;
+tag 30 IPmasksupplier boolean 1 1;
+tag 31 IPdiscovery boolean 1 1;
+tag 32 IPsolicitation ip 1 1;
+tag 33 IPstaticroute ip 2 0;
+tag 34 ARPtrailer boolean 1 1;
+tag 35 ARPtimeout number 4 1;
+tag 36 ETHencapsulation boolean 1 1;
+tag 37 TCPTTL number 1 1;
+tag 38 TCPkeepaliveinterval number 4 1;
+tag 39 TCPkeepalivegarbage boolean 1 1;
+tag 40 NISdomain ascii 1 0;
+tag 41 NISserver ip 1 0;
+tag 42 NTPserver ip 1 0;
+tag 43 VENDOR octet 1 0;
+tag 44 NetBIOSNS ip 1 0;
+tag 45 NetBIOSdgram ip 1 0;
+tag 46 NetBIOSnodetype number 1 1;
+tag 47 NetBIOSscope octet 1 0;
+tag 48 Xfontserver ip 1 0;
+tag 49 XDM ip 1 0;
+tag 50 DHCPreqip ip 1 1;
+tag 51 DHCPlease number 4 1;
+tag 52 DHCPoverload number 1 1;
+tag 53 DHCPtype number 1 1;
+tag 54 DHCPserverID ip 1 1;
+tag 55 DHCPreqpar number 1 0;
+tag 56 DHCPmessage ascii 1 0;
+tag 57 DHCPsize number 2 1;
+tag 58 DHCPrenewal number 4 1;
+tag 59 DHCPrebinding number 4 1;
+tag 60 DHCPclassID ascii 1 0;
+tag 61 DHCPclientID octet 1 0;

etc/usr/rc

@@ -1,7 +1,6 @@
 # /usr/etc/rc - continued system initialization.
 
 RANDOM_FILE=/usr/adm/random.dat
-TCPISN_FILE=/usr/adm/tcpisn.dat
 LOCAL_FILE=/usr/etc/rc.local
 
 ARCH="`sysenv arch`"
@@ -26,10 +25,13 @@ fi
 bootcd="`/bin/sysenv bootcd`"
 
 case "$#:$1" in
-1:start|1:stop)
+1:autoboot)
+    action=start
+    ;;
+1:start|1:stop|1:down)
     action=$1
     ;;
-*)  echo >&2 "Usage: $0 [start|stop]"
+*)  echo >&2 "Usage: $0 autoboot|start|stop|down"
     exit 1
 esac
 
@@ -57,6 +59,7 @@ daemonize()
     # Function to start a daemon, if it exists.
     local IFS=':'
     local name="$1"
+    test "$1" = tcpd && name="$2"
 
     for dir in $PATH
     do
@@ -94,7 +97,7 @@ up()
     for dir in $SERVICES_DIRS
     do	bin=$dir/$service
 	if [ -x $bin -a -z "$found" ]
-	then	minix-service $opt up $bin "$@" 
+	then	service $opt up $bin "$@" 
     		echo -n " $service"
 		found=yes
 	fi
@@ -104,74 +107,12 @@ up()
     fi
 }
 
-# Print a list of labels of detected PCI ethernet hardware devices.
-get_pci_eth_labels()
-{
-	# We need to match all PCI ethernet hardware devices against all
-	# drivers.  For performance reasons, we construct a lookup table on the
-	# fly here.  In order to do that, we need to give both a list of all
-	# available network drivers with PCI device IDs (part 1 of the code
-	# below) and a list of all actually present ethernet hardware devices
-	# (part 2) to an awk script (part 3).  The awk script can tell the
-	# difference between the list entries based on whether there is a
-	# leading space on the line.  For part 2, we grab only devices that are
-	# in PCI class 2 (network controller) subclass 0 (ethernet controller).
-
-	# Part 1: collect all network drivers with supported PCI IDs
-	(for dir in $SYSTEM_CONF_DIRS; do
-		for f in $dir/$SYSTEM_CONF_SUBDIR/*; do
-			if [ -f $f ]; then
-				printconfig $f | grep ',type net.*,pci device'
-			fi
-		done
-	done | sed 's/^service \([^,]*\),.*,pci device/ \1/g';
-	# Part 2: grab all PCI IDs of ethernet hardware devices (class 2/0)
-	cat /proc/pci | grep '^[^ ]* 2/0/' | cut -d' ' -f3) | awk '
-	# Part 3: first construct a PCI-ID-to-driver table based on the lines
-	# produced by part 1 (with leading space), which each contain one
-	# driver name followed by one or more PCI IDs; then, go through all
-	# the ethernet hardware devices found in part 2 (no leading space) and
-	# if if there is a hit in the table, print the driver label to use.
-	/^ / { for (i=2;i<=NF;i++) drivers[$(i)]=$1 }
-	/^[^ ]/ {
-		# There is a bit of a discrepancy between output formats of
-		# /proc/pci and printconfig: the former uses
-		# "vid:did:sub_vid:sub_did" whereas the latter uses
-		# "vid:did/sub_vid:sub_did".  No problem; in the common case
-		# (= no sub IDs used) we need to split the PCI ID anyway.
-		if (split($1,id,":") >= 4) {
-			# Try a full "vid:did:sub_vid:sub_did" match.
-			name=drivers[id[1]":"id[2]"/"id[3]":"id[4]]
-		}
-		# No sub IDs or no match found?  Try a "vid:did" match.
-		if (!name) name=drivers[id[1]":"id[2]]
-		# If found, print the resulting label (<name>_<instance>)
-		if (name) {
-			print name"_"(instance[name]+0)
-			instance[name]++
-		}
-	}
-	'
-}
-
-# Print a list of labels of ethernet hardware devices that have been detected
-# to be present on the system.  Each label has the format '<driver>_<instance>'
-# where <driver> is the file name of the driver (in /service) and <instance> is
-# a zero-based, per-driver instance number of the device.
 get_eth_labels() {
-	# For now, do autodetection only on platforms with (x86) PCI support.
+  # Filter out the non-vlan ethernet entries from inet.conf.
-	# For (x86) ISA drivers, a custom network setting script is required;
+  # Produce as output a list of "drivername_instancenr"-formatted labels.
-	# see below.  For ARM platforms, the driver (if any) is started based
+  sed 's/\008/ /g' /etc/inet.conf | \
-	# on the board; there is no device autodetection.
+    sed -n 's/^ *eth[0-9][0-9]* *\([^ ][^ ]*\) *\([0-9][0-9]*\).*$/\1_\2/p' | \
-	if [ -f /proc/pci ]; then
+    grep -v '^vlan_'
-		get_pci_eth_labels
-	fi
-
-	# Add any network drivers manually configured in /usr/etc/rc.local by
-	# the netconf(8) utility.
-	if [ -n "$netdriver" ]; then
-		echo "${netdriver}_0"
-	fi
 }
 
 # Detect expansion boards on the BeagleBone and load the proper drivers.
@@ -217,8 +158,10 @@ capemgr() {
     done
 }
 
+DAEMONS=/etc/rc.daemons
+
 case $action in
-start)
+start|autoboot)
     # Select console font.
     test -f /etc/font && loadfont /etc/font </dev/console
 
@@ -242,7 +185,7 @@ start)
 	date >> /dev/urandom
     fi
 
-    # start network driver instances for all detected ethernet devices
+    # start network driver instances for all configured ethernet devices
     for label in $(get_eth_labels); do
         driver=$(echo $label | sed 's/\(.*\)_.*/\1/')
         instance=$(echo $label | sed 's/.*_//')
@@ -251,39 +194,17 @@ start)
         arg="-args \"instance=$instance$arg\""
         eval up $driver -label $label $arg -period 5HZ
     done
+    if [ X`/bin/sysenv lwip` = Xyes ]
+    then
+	up lwip -script /etc/rs.inet -dev /dev/ip
+    else
+	up inet -script /etc/rs.inet -dev /dev/ip
+    fi
 
     # pty needs to know the "tty" group ID
     up pty -dev /dev/ptmx -args "gid=`stat -f '%g' /dev/ptmx`"
 
-    # Start the LWIP service.
+    up uds -dev /dev/uds
-    up lwip -dev /dev/bpf -script /etc/rs.lwip
-
-    # Load stable seed for TCP Initial Sequence Number generation (RFC 6528).
-    # The idea here is that (especially) after a system crash, the seed stays
-    # the same, so as to make it unlikely that incoming packets for connections
-    # from before the crash are accepted on connections after the crash.
-    TCPISN_LEN=$(sysctl -n net.inet.tcp.isn_secret | awk '{print length/2}')
-    if [ ! -f $TCPISN_FILE ]; then
-	# If the /usr file system is read-only, we cannot create the file.  In
-	# that case, we draw a temporary secret from the random service.
-	if grep ' \/usr .*rw.*' /etc/mtab >/dev/null; then
-	    dd if=/dev/random of=$TCPISN_FILE bs=$TCPISN_LEN count=1 2>/dev/null
-	else
-	    TCPISN_FILE=/dev/random
-	fi
-    fi
-    sysctl -qw net.inet.tcp.isn_secret=`dd if=$TCPISN_FILE bs=$TCPISN_LEN \
-	count=1 2>/dev/null | hexdump -v -e '/1 "%02x"'` 2>/dev/null
-
-    # LWIP does not block until all network drivers have fully initialized and
-    # reported back to LWIP.  That may prevent proper configuration of the
-    # corresponding interfaces a bit later.  Sleep up to five seconds waiting
-    # for all registered network drivers to initialize and report to LWIP.
-    for i in 1 2 3 4 5; do
-	[ $(sysctl -n minix.lwip.drivers.pending) -gt 0 ] && sleep 1
-    done
-
-    up uds
 
     up -n ipc
 
@@ -300,6 +221,9 @@ start)
 
     echo .
 
+    # Network initialization.
+    (: </dev/tcp) 2>/dev/null && net=t	# Is there a TCP/IP server?
+
     echo -n "Starting daemons:"
     daemonize update
 
@@ -312,7 +236,9 @@ start)
 		ln -s /tmp/log /var/log || true
 		. /etc/rc.cd
     fi
-
+    # syslogd has not been started yet
+    rm -f /var/run/syslogd.pid
+    daemonize syslogd -s
     echo .
 
     # i2c only supported on ARM at the moment
@@ -345,9 +271,6 @@ start)
 			up tps65217 -label tps65217.1.24 \
 			        -args 'bus=1 address=0x24'
 
-			# Start ethernet driver.
-			up lan8710a -label lan8710a_0 -args 'instance=0'
-
 			# check for the presence of a display
 			eepromread -f /dev/i2c-2 -n > /dev/null 2>&1
 			RESULT=$?
@@ -394,9 +317,6 @@ start)
 			up tda19988 -label tda19988.1.3470 -args \
 				'cec_bus=1 cec_address=0x34 hdmi_bus=1 hdmi_address=0x70'
 
-			# Start ethernet driver.
-			up lan8710a -label lan8710a_0 -args 'instance=0'
-
 			# start frame buffer
 			#up fb -dev /dev/fb0 -args edid.0=tda19988.1.3470
 			# fb hasn't been ported to AM335X yet.
@@ -444,6 +364,52 @@ start)
 	echo .
     fi
 
+    if [ "$net" ]
+    then
+	if [ -f /etc/rc.net ]
+	then
+	    # Let a customized TCP/IP initialization script figure it out.
+	    . /etc/rc.net
+	else
+	    # Standard network daemons.
+    	    echo -n "Starting networking:"
+	    if grep -s 'psip0.*default' /etc/inet.conf >/dev/null
+	    then	ifconfig -h 10.0.0.1
+	    else
+		    if [ X`/bin/sysenv lwip` = Xyes ]
+		    then
+			dhcpd --lwip &
+			echo -n " dhcpd"
+		    else
+			daemonize dhcpd
+		    fi
+	    fi
+	    daemonize nonamed -L
+	    if [ -f "$DAEMONS" ]
+	    then	. "$DAEMONS"
+	    fi
+	    # The last daemon has been started, so close the list:
+	    echo .
+	fi
+    fi
+
+    # Now that all device files should be created, see if we need to update the
+    # device file database.  This code is butchered from NetBSD etc/rc.d/sysdb.
+    DEVDIR=/dev
+    DEVDB=/var/run/dev.cdb
+    if [ ! -f "$DEVDB" -o "$DEVDIR" -nt "$DEVDB" ]
+    then
+	dev_mkdb
+    fi
+
+    if [ "$net" ]
+    then
+	# Get the nodename from the DNS and set it.
+	trap '' 2
+	intr -t 20 hostaddr -h
+	trap 2
+    fi
+
     # Load the stored hostname into the sysctl database.
     test -r /etc/hostname.file && hostname $(cat /etc/hostname.file)
 
@@ -453,7 +419,7 @@ start)
     # Run the daily cleanup on systems that are not on at night.
     test -f /usr/etc/daily && sh /usr/etc/daily boot &
 ;;
-stop)
+stop|down)
     	# Save random data, if /usr is mounted rw.
 	if grep ' \/usr .*rw.*' /etc/mtab >/dev/null
 	then
@@ -465,3 +431,24 @@ stop)
 	  fi
 	fi
 esac
+
+d=
+# Let packages run their own scripts
+for d in /usr/local/etc/rc.d /usr/pkg/etc/rc.d
+do
+if [ -d "$d" -a -z "$bootcd" ]
+then	( if cd $d
+	then
+		echo -n "Local packages ($action): "
+		for f in *
+		do
+			if [ -x "$f" ]
+			then	echo -n "$f "
+				sh "$f" "$action"
+			fi
+		done
+		echo " done."
+	fi
+	)
+fi
+done

external/bsd/Makefile

@@ -3,10 +3,10 @@
 .include <bsd.own.mk>
 
 #MINIX:
-SUBDIR=	bind byacc dhcpcd \
+SUBDIR=	byacc \
 	fetch file flex less \
-	libarchive libevent libpcap mdocml \
+	libarchive libevent mdocml \
-	openresolv tcpdump tmux top
+	tmux top libfdt
 
 .if (${MKATF} != "no")
 SUBDIR+= atf
@@ -44,6 +44,6 @@ SUBDIR+= librtld_db
 .endif
 
 #MINIX:
-SUBDIR+= blacklist dhcp nvi
+SUBDIR+= blacklist nvi
 
 .include <bsd.subdir.mk>

external/bsd/bind/Makefile

@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2009/04/12 03:46:04 christos Exp $
-
-SUBDIR+= lib .WAIT bin
-
-.include <bsd.subdir.mk>

external/bsd/bind/Makefile.inc

@@ -1,130 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.22 2014/08/18 04:40:51 christos Exp $
-
-.if !defined(BIND9_MAKEFILE_INC)
-BIND9_MAKEFILE_INC=yes
-
-#NAMED_DEBUG=1
-
-USE_FORT?= yes	# network client/server
-
-WARNS?=	1
-
-CWARNFLAGS.clang+=	-Wno-unused-value -Wno-parentheses
-
-.include <bsd.own.mk>
-
-.if ${MKCRYPTO} == "no"
-NAMED_USE_OPENSSL?=no
-.else
-NAMED_USE_OPENSSL?=yes
-.endif
-
-.if exists(${NETBSDSRCDIR}/sys/sys/atomic.h) && !defined(__MINIX)
-NAMED_USE_PTHREADS?=yes
-.else
-NAMED_USE_PTHREADS?=no
-.endif
-
-IDIST=		${NETBSDSRCDIR}/external/bsd/bind/dist
-BIND_SRCDIR=	${NETBSDSRCDIR}/external/bsd/bind
-BIND_HTMLDIR=	/usr/share/doc/reference/ref8/bind9
-
-.include "${IDIST}/version"
-
-VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
-SYSCONFDIR=/etc
-LOCALSTATEDIR=/var
-
-CPPFLAGS+=-I${BIND_SRCDIR}/include \
-	-I${IDIST} \
-	-I${IDIST}/lib/dns/include \
-	-I${IDIST}/lib/isc/include -I${IDIST}/lib/isc/unix/include \
-	-I${IDIST}/lib/bind9/include \
-	-I${IDIST}/lib/isccfg/include \
-	-I${IDIST}/lib/isccc/include \
-	-I${IDIST}/lib/lwres/include -I${IDIST}/lib/lwres/unix/include \
-	-DNS_LOCALSTATEDIR=\"${LOCALSTATEDIR}\" \
-	-DNS_SYSCONFDIR=\"${SYSCONFDIR}\" \
-	-DSESSION_KEYFILE=\"${LOCALSTATEDIR}/run/named/session.key\" \
-	-DVERSION=\"${VERSION}\" -DBIND9
-
-.if (${USE_INET6} != "no")
-CPPFLAGS+=	-DWANT_IPV6
-CPPFLAGS+=	-DALLOW_FILTER_AAAA
-.endif
-
-.if defined(HAVE_GCC)
-COPTS+=	-Wno-pointer-sign
-.endif
-
-.if defined(NAMED_DEBUG)
-DBG=-g3 -gstabs
-.endif
-
-.if !defined(LIB) || empty(LIB)
-# NOTE: the order of these libraries is important...
-.if defined(NAMED_DEBUG)
-LDADD+=		-lbind9_g -llwres_g -lisccfg_g -ldns_g -lisccc_g -lisc_g
-.else
-LDADD+=		-lbind9 -llwres -lisccfg -ldns -lisccc -lisc
-DPADD+=		${LIBBIND9} ${LIBDNS} ${LIBLWRES}
-DPADD+=		${LIBISCCFG} ${LIBISCCC} ${LIBISC}
-.endif
-.else
-CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
-	   -DLIBREVISION=${LIBREVISION} -DLIBAGE=${LIBAGE}
-.endif
-#CPPFLAGS+= -DUSE_MEMIMPREGISTER -DUSE_APPIMPREGISTER -DUSE_SOCKETIMPREGISTER \
-#    -DUSE_TIMERIMPREGISTER
-
-.if ${NAMED_USE_PTHREADS} == "yes"
-# XXX: Not ready yet
-# CPPFLAGS+=	-DISC_PLATFORM_USE_NATIVE_RWLOCKS
-CPPFLAGS+=	-DISC_PLATFORM_USETHREADS
-.if !defined (LIB) || empty(LIB)
-LDADD+= -lpthread
-DPADD+= ${LIBPTHREAD}
-.else
-LIBDPLIBS+=      pthread  ${NETBSDSRCDIR}/lib/libpthread
-.endif
-.endif
-
-.if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
-.if ${MKKERBEROS} != "no"
-CPPFLAGS+=-DGSSAPI
-.endif
-.if ${MKKERBEROS} != "no"
-.if !defined (LIB) || empty(LIB)
-LDADD+= -lgssapi -lheimntlm -lkrb5 -lhx509 -lheimbase \
-	-lcom_err  -lroken -lasn1 -lwind
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
-	${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
-.else
-.for L in gssapi krb5 hx509 heimntlm heimbase com_err roken asn1 wind
-LIBDPLIBS+=	$L ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/lib$L
-.endfor
-.endif
-.endif
-.if !defined (LIB) || empty(LIB)
-LDADD+= -lcrypto -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-.else
-.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
-LIBDPLIBS+=	crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-.else
-LIBDPLIBS+=	crypto ${NETBSDSRCDIR}/lib/libcrypto
-.endif
-.endif
-.endif
-
-.if ${NAMED_USE_PTHREADS} == "yes"
-CPPFLAGS+=-DISC_PLATFORM_USETHREADS -I${IDIST}/lib/isc/pthreads/include
-.else
-CPPFLAGS+=-I${IDIST}/lib/isc/nothreads/include
-.endif
-
-.if exists(${.PARSEDIR}/../Makefile.inc)
-.include "${.PARSEDIR}/../Makefile.inc"
-.endif
-.endif