Date: Thu, 24 Jan 2013 20:27:24 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40739 - head/en_US.ISO8859-1/books/handbook/cutting-edge Message-ID: <201301242027.r0OKROLb073226@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Thu Jan 24 20:27:24 2013 New Revision: 40739 URL: http://svnweb.freebsd.org/changeset/doc/40739 Log: Force an empty make.conf in freebsd-update section custom kernel instructions. Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Thu Jan 24 18:07:39 2013 (r40738) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Thu Jan 24 20:27:24 2013 (r40739) @@ -431,7 +431,7 @@ MergeChanges /etc/ /var/named/etc/</prog installed from the sources:</para> <screen>&prompt.root; <userinput>cd /usr/src</userinput> -&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel</userinput> +&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null</userinput> &prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput> &prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen> @@ -440,8 +440,7 @@ MergeChanges /etc/ /var/named/etc/</prog by <command>freebsd-update</command>, the <filename>GENERIC</filename> configuration file must not have been modified in any way. It is also suggested that - it is built without any other special options (preferably - with an empty <filename>/etc/make.conf</filename>).</para> + it is built without any other special options.</para> </listitem> </itemizedlist> @@ -479,7 +478,7 @@ MergeChanges /etc/ /var/named/etc/</prog installed from the sources:</para> <screen>&prompt.root; <userinput>cd /usr/src</userinput> -&prompt.root; <userinput>make kernel</userinput></screen> +&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null</userinput></screen> <para>For this kernel to be identified as the <literal>GENERIC</literal> kernel by @@ -487,8 +486,7 @@ MergeChanges /etc/ /var/named/etc/</prog <filename>GENERIC</filename> configuration file must not have been modified in any way. It is also suggested that the kernel is built without any other - special options, preferably with an empty - <filename>/etc/make.conf</filename>.</para> + special options.</para> </listitem> </itemizedlist>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301242027.r0OKROLb073226>