diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-27 16:18:41 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-27 16:18:41 -0200 |
| commit | 6d77218901c68616c2f97486c813b9a78c48046a (patch) | |
| tree | f6974ba3b91df6ca8da937254277c65eb3c9cae2 /etc | |
| parent | eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4 (diff) | |
| parent | fbe44d1207452eedc6fc9c1f386a335c5bda0e20 (diff) | |
| download | FreeBSD-src-6d77218901c68616c2f97486c813b9a78c48046a.zip FreeBSD-src-6d77218901c68616c2f97486c813b9a78c48046a.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/netstart | 3 | ||||
| -rwxr-xr-x | etc/periodic/daily/400.status-disks | 7 | ||||
| -rwxr-xr-x | etc/rc.d/local_unbound | 2 | ||||
| -rwxr-xr-x | etc/rc.d/othermta | 2 | ||||
| -rw-r--r-- | etc/rc.shutdown | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/etc/netstart b/etc/netstart index 44b8ab7..99d4f81 100755 --- a/etc/netstart +++ b/etc/netstart @@ -34,9 +34,6 @@ # the network by hand, this script will do it for you). # -. /etc/rc.subr - -load_rc_config 'XXX' _start=quietstart /etc/rc.d/devd ${_start} diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks index dd828aa..bab2810 100755 --- a/etc/periodic/daily/400.status-disks +++ b/etc/periodic/daily/400.status-disks @@ -16,7 +16,12 @@ case "$daily_status_disks_enable" in echo "" echo "Disk status:" - df $daily_status_disks_df_flags && rc=1 || rc=3 + if [ -n "${daily_status_disks_ignore}" ] ; then + ignore="egrep -v ${daily_status_disks_ignore}" + else + ignore="cat" + fi + (df $daily_status_disks_df_flags | ${ignore}) && rc=1 || rc=3 # display which filesystems need backing up if [ -s /etc/dumpdates ]; then diff --git a/etc/rc.d/local_unbound b/etc/rc.d/local_unbound index 0a81e2c..0cd1ff3 100755 --- a/etc/rc.d/local_unbound +++ b/etc/rc.d/local_unbound @@ -30,6 +30,7 @@ load_rc_config $name : ${local_unbound_config:=${local_unbound_workdir}/unbound.conf} : ${local_unbound_flags:="-c ${local_unbound_config}"} : ${local_unbound_forwardconf:=${local_unbound_workdir}/forward.conf} +: ${local_unbound_controlconf:=${local_unbound_workdir}/control.conf} : ${local_unbound_anchor:=${local_unbound_workdir}/root.key} : ${local_unbound_forwarders:=} @@ -68,6 +69,7 @@ local_unbound_setup() -w ${local_unbound_workdir} \ -c ${local_unbound_config} \ -f ${local_unbound_forwardconf} \ + -o ${local_unbound_controlconf} \ -a ${local_unbound_anchor} \ ${local_unbound_forwarders} } diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta index 7ab3e63..36292ae 100755 --- a/etc/rc.d/othermta +++ b/etc/rc.d/othermta @@ -10,7 +10,7 @@ # . /etc/rc.subr -load_rc_config 'XXX' +load_rc_config if [ -n "${mta_start_script}" ]; then [ "${mta_start_script}" != "/etc/rc.sendmail" ] && \ diff --git a/etc/rc.shutdown b/etc/rc.shutdown index a0dd698..15779c7 100644 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -45,7 +45,7 @@ export HOME PATH . /etc/rc.subr -load_rc_config 'XXX' +load_rc_config # reverse_list list # print the list in reverse order |
