diff options
| author | dim <dim@FreeBSD.org> | 2016-01-15 17:55:00 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-15 17:55:00 +0000 |
| commit | 6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe (patch) | |
| tree | 402d8f6984826f9801b169f8bc8a5dae20ed1c60 /etc | |
| parent | 8e5c968a84ceadc1d422b13933e1edc45c5372ea (diff) | |
| parent | 5ac53a20e575001384d1acfb426a65ae8c309c24 (diff) | |
| download | FreeBSD-src-6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe.zip FreeBSD-src-6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe.tar.gz | |
Merge ^/head r293850 through r294089.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 9 | ||||
| -rwxr-xr-x | etc/rc.d/mountcritlocal | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/etc/Makefile b/etc/Makefile index 5484c11..27d1ba4 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -82,10 +82,6 @@ BIN1+= apmd.conf BIN1+= auto_master .endif -.if ${MK_BSNMP} != "no" -BIN1+= snmpd.config -.endif - .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif @@ -219,6 +215,11 @@ distribution: ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; +.if ${MK_BSNMP} != "no" + cd ${.CURDIR}; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ + snmpd.config ${DESTDIR}/etc; +.endif .if ${MK_AT} == "no" sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab .endif diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal index 1513ec7..069e3fd 100755 --- a/etc/rc.d/mountcritlocal +++ b/etc/rc.d/mountcritlocal @@ -36,15 +36,15 @@ mountcritlocal_start() done mount_excludes=${mount_excludes%,} - # Originally, root mount hold had to be released before mounting the root - # filesystem. This delayed the boot, so it was changed to only wait if - # the root device isn't readily available. This can result in this script - # executing before all the devices - such as graid(8) - are available. - # Thus, should the mount fail, we will wait for the root mount hold release - # and retry. + # Originally, root mount hold had to be released before mounting + # the root filesystem. This delayed the boot, so it was changed + # to only wait if the root device isn't readily available. This + # can result in this script executing before all the devices - such + # as graid(8) - are available. Thus, should the mount fail, + # we will wait for the root mount hold release and retry. mount -a -t ${mount_excludes} err=$? - if [ $? -ne 0 ]; then + if [ ${err} -ne 0 ]; then echo echo 'Mounting /etc/fstab filesystems failed,' \ 'will retry after root mount hold release' |
