aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-10-23 14:38:08 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-10-23 14:38:08 +0000
commit8c14a4095d7a048dae3d70bc967621e380147bdf (patch)
tree892a30ca704e68fee62df958bb874af3a4eb3202 /release/Makefile
parent3ad12d2782d19864056a04ab3676ba008003b397 (diff)
downloadsrc-8c14a4095d7a048dae3d70bc967621e380147bdf.tar.gz
src-8c14a4095d7a048dae3d70bc967621e380147bdf.zip
Add debug.witness.trace=0 back to the installer sysctl.conf(5),
incorrectly removed from head when it should have been removed from stable/12 post-branch. Reported by: bdrewery Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=339657
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/release/Makefile b/release/Makefile
index c4bbb1e5ae84..d563825e2376 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -210,6 +210,7 @@ disc1: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+ echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
@@ -237,6 +238,7 @@ bootonly: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+ echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
@@ -261,6 +263,7 @@ dvd: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+ echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc