diff options
| author | dim <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
| commit | c00aebe66513aba0a00dc82f99b3895df3877909 (patch) | |
| tree | b76068543cf8760cf057750c9cd4fdd7ab5834d4 /etc | |
| parent | 21319e8ca544f3244b9e7dded4fb9f9619df5e81 (diff) | |
| parent | 03939e42e68cd44a8cc42503cb35e7fad919b2cc (diff) | |
| download | FreeBSD-src-c00aebe66513aba0a00dc82f99b3895df3877909.zip FreeBSD-src-c00aebe66513aba0a00dc82f99b3895df3877909.tar.gz | |
Merge ^/head r279313 through r279595.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 162 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 4 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 1 | ||||
| -rw-r--r-- | etc/rc.d/iovctl | 39 | ||||
| -rwxr-xr-x | etc/rc.d/netif | 2 |
6 files changed, 207 insertions, 3 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 4519e87..3499465 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -667,6 +667,8 @@ casperd_enable="YES" # casperd(8) daemon rctl_enable="NO" # Load rctl(8) rules on boot rctl_rules="/etc/rctl.conf" # rctl(8) ruleset. See rctl.conf(5). +iovctl_files="" # Config files for iovctl(8) + ############################################################## ### Jail Configuration (see rc.conf(5) manual page) ########## ############################################################## diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 7ea2155..35e1c06 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -49,6 +49,168 @@ usr.bin .. usr.sbin + dtrace + common + aggs + .. + arithmetic + .. + arrays + .. + assocs + .. + begin + .. + bitfields + .. + buffering + .. + builtinvar + .. + cg + .. + clauses + .. + cpc + .. + decls + .. + drops + .. + dtraceUtil + .. + end + .. + enum + .. + error + .. + exit + .. + fbtprovider + .. + funcs + .. + grammar + .. + include + .. + inline + .. + io + .. + ip + .. + java_api + .. + json + .. + lexer + .. + llquantize + .. + mdb + .. + mib + .. + misc + .. + multiaggs + .. + offsetof + .. + operators + .. + pid + .. + plockstat + .. + pointers + .. + pragma + .. + predicates + .. + preprocessor + .. + print + .. + printa + .. + printf + .. + privs + .. + probes + .. + proc + .. + profile-n + .. + providers + .. + raise + .. + rates + .. + safety + .. + scalars + .. + sched + .. + scripting + .. + sdt + .. + sizeof + .. + speculation + .. + stability + .. + stack + .. + stackdepth + .. + stop + .. + strlen + .. + strtoll + .. + struct + .. + syscall + .. + sysevent + .. + tick-n + .. + trace + .. + tracemem + .. + translators + .. + typedef + .. + types + .. + uctf + .. + union + .. + usdt + .. + ustack + .. + vars + .. + version + .. + .. + .. .. .. etc diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 0e306d6..293733b 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -183,8 +183,6 @@ .. atm .. - binutils - .. legal intel_ipw .. @@ -417,6 +415,8 @@ .. tcsh .. + uefisign + .. .. games fortune diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index a1f879e..1e6e28f 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -44,6 +44,7 @@ FILES= DAEMON \ hostid \ hostid_save \ hostname \ + iovctl \ ip6addrctl \ ipfilter \ ipfs \ diff --git a/etc/rc.d/iovctl b/etc/rc.d/iovctl new file mode 100644 index 0000000..f207b08 --- /dev/null +++ b/etc/rc.d/iovctl @@ -0,0 +1,39 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: iovctl +# REQUIRE: FILESYSTEMS sysctl + +. /etc/rc.subr + +name="iovctl" +command="/usr/sbin/iovctl" +start_cmd="iovctl_start" +stop_cmd="iovctl_stop" + +run_iovctl() +{ + local _f flag + + flag=$1 + for _f in ${iovctl_files} ; do + if [ -r ${_f} ]; then + ${command} ${flag} -f ${_f} > /dev/null + fi + done +} + +iovctl_start() +{ + run_iovctl -E +} + +iovctl_stop() +{ + run_iovctl -D +} + +load_rc_config $name +run_rc_command "$1" diff --git a/etc/rc.d/netif b/etc/rc.d/netif index 62ad31f..0915b28 100755 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -26,7 +26,7 @@ # # PROVIDE: netif -# REQUIRE: atm1 FILESYSTEMS serial sppp sysctl +# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet |
