From owner-svn-doc-all@FreeBSD.ORG Tue May 6 16:47:13 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 395B4E46; Tue, 6 May 2014 16:47:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A1B3917; Tue, 6 May 2014 16:47:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46GlCn5011141; Tue, 6 May 2014 16:47:12 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46GlCqU011140; Tue, 6 May 2014 16:47:12 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201405061647.s46GlCqU011140@svn.freebsd.org> From: Dru Lavigne Date: Tue, 6 May 2014 16:47:12 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44774 - head/en_US.ISO8859-1/books/handbook/cutting-edge X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 16:47:13 -0000 Author: dru Date: Tue May 6 16:47:12 2014 New Revision: 44774 URL: http://svnweb.freebsd.org/changeset/doc/44774 Log: Some shuffling to remove redundancy in Upgrade Major/Minor sections. Put 9.x instructions before 8.x instructions. More commits to come. Sponsored by: iXsystems 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 Tue May 6 15:46:15 2014 (r44773) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue May 6 16:47:12 2014 (r44774) @@ -368,154 +368,18 @@ Uninstalling updates... done. - Major and Minor Version Upgrades + Performing Major and Minor Version Upgrades Upgrades from one minor version of &os; to another, like from &os; 9.0 to &os; 9.1, are called - minor version upgrades. Generally, - installed applications will continue to work without problems - after minor version upgrades. - - Major version upgrades occur when + minor version upgrades. + Major version upgrades occur when &os; is upgraded from one major version to another, like from - &os; 9.X to &os; 10.X. Major versions use different - Application Binary Interfaces (ABIs), which - which will break most third-party - applications. After a - major version upgrade, all installed packages and - ports need to be upgraded using a utility such as - ports-mgmt/portmaster. A - rebuild of all installed applications can be - accomplished with this command: - - &prompt.root; portmaster -af - - This command will display the configuration screens for - each application that has configurable options and wait for the user to interact with those - screens. To prevent this behavior, and use only the default - options, include in the above command. - - - Dealing with Custom Kernels - - If a custom kernel is in use, the upgrade process is - slightly more involved, and the procedure varies depending - on the version of &os;. - - - Custom Kernels with &os; 8.X - - A copy of the GENERIC kernel is - needed, and should be placed in - /boot/GENERIC. If the - GENERIC kernel is not present in the - system, it may be obtained using one of the following - methods: - - - - If a custom kernel has only been built once, the - kernel in /boot/kernel.old is - actually GENERIC. Rename this - directory to - /boot/GENERIC. - - - - Assuming physical access to the machine is - possible, a copy of the GENERIC - kernel can be installed from the installation media - using the following commands: - - &prompt.root; mount /cdrom -&prompt.root; cd /cdrom/X.Y-RELEASE/kernels -&prompt.root; ./install.sh GENERIC - - Replace X.Y-RELEASE - with the actual version of the release being used. - The GENERIC kernel will be - installed in /boot/GENERIC by - default. - - - - Failing all the above, the - GENERIC kernel may be rebuilt and - installed from source: - - &prompt.root; cd /usr/src -&prompt.root; env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null -&prompt.root; mv /boot/GENERIC/boot/kernel/* /boot/GENERIC -&prompt.root; rm -rf /boot/GENERIC/boot - - For this kernel to be picked up as - GENERIC by - freebsd-update, the - GENERIC configuration file must - not have been modified in any way. It is also - suggested that it is built without any other special - options. - - - - Rebooting to the GENERIC kernel - is not required at this stage. - - - - Custom Kernels with &os; 9.X and Later - - - - If a custom kernel has only been built once, the - kernel in /boot/kernel.old is - actually the GENERIC kernel. - Rename this directory to - /boot/kernel. - - - - If physical access to the machine is available, a - copy of the GENERIC kernel can be - installed from the installation media using these - commands: - - &prompt.root; mount /cdrom -&prompt.root; cd /cdrom/usr/freebsd-dist -&prompt.root; tar -C/ -xvf kernel.txz boot/kernel/kernel - - - - If the options above cannot be used, the - GENERIC kernel may be rebuilt and - installed from source: - - &prompt.root; cd /usr/src -&prompt.root; make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null - - For this kernel to be identified as the - GENERIC kernel by - freebsd-update, the - GENERIC configuration file must - not have been modified in any way. It is also - suggested that the kernel is built without any other - special options. - - - - Rebooting to the GENERIC kernel - is not required at this stage. - - - - - Performing the Upgrade - - Major and minor version upgrades may be performed by - providing freebsd-update with a release - version target. The following command will update to - &os; 9.1: + &os; 9.X to &os; 10.X. Both types of upgrades can + be performed by providing freebsd-update + with a release version target. The following command, when + run on a &os; 9.0 system, will upgrade it to + &os; 9.1: &prompt.root; freebsd-update -r 9.1-RELEASE upgrade @@ -541,7 +405,7 @@ The following components of FreeBSD do n kernel/generic world/catpages world/dict world/doc world/games world/proflibs -Does this look reasonable (y/n)? y +Does this look reasonable (y/n)? y At this point, freebsd-update will attempt to download all files required for the upgrade. In @@ -628,19 +492,142 @@ before running "/usr/sbin/freebsd-update were bumped, there may only be two install phases instead of three. + + The upgrade is now complete. If this was a major + version upgrade, reinstall all ports and packages as + described in . + If the system uses a custom kernel, refer to either or for + instructions on how to upgrade the custom kernel. + + + Custom Kernels with &os; 9.X and Later + + + + If a custom kernel has only been built once, the + kernel in /boot/kernel.old is + actually the GENERIC kernel. + Rename this directory to + /boot/kernel. + + + + If physical access to the machine is available, a + copy of the GENERIC kernel can be + installed from the installation media using these + commands: + + &prompt.root; mount /cdrom +&prompt.root; cd /cdrom/usr/freebsd-dist +&prompt.root; tar -C/ -xvf kernel.txz boot/kernel/kernel + + + + If the options above cannot be used, the + GENERIC kernel may be rebuilt and + installed from source: + + &prompt.root; cd /usr/src +&prompt.root; make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null + + For this kernel to be identified as the + GENERIC kernel by + freebsd-update, the + GENERIC configuration file must + not have been modified in any way. It is also + suggested that the kernel is built without any other + special options. + + + + Rebooting to the GENERIC kernel + is not required at this stage. + + Custom Kernels with &os; 8.X + + A copy of the GENERIC kernel is + needed, and should be placed in + /boot/GENERIC. If the + GENERIC kernel is not present in the + system, it may be obtained using one of the following + methods: + + + + If a custom kernel has only been built once, the + kernel in /boot/kernel.old is + actually GENERIC. Rename this + directory to + /boot/GENERIC. + + + + Assuming physical access to the machine is + possible, a copy of the GENERIC + kernel can be installed from the installation media + using the following commands: + + &prompt.root; mount /cdrom +&prompt.root; cd /cdrom/X.Y-RELEASE/kernels +&prompt.root; ./install.sh GENERIC + + Replace X.Y-RELEASE + with the actual version of the release being used. + The GENERIC kernel will be + installed in /boot/GENERIC by + default. + + + + Failing all the above, the + GENERIC kernel may be rebuilt and + installed from source: + + &prompt.root; cd /usr/src +&prompt.root; env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null +&prompt.root; mv /boot/GENERIC/boot/kernel/* /boot/GENERIC +&prompt.root; rm -rf /boot/GENERIC/boot + + For this kernel to be picked up as + GENERIC by + freebsd-update, the + GENERIC configuration file must + not have been modified in any way. It is also + suggested that it is built without any other special + options. + + + + Rebooting to the GENERIC kernel + is not required at this stage. + + Rebuilding Ports After a Major Version Upgrade - After a major version upgrade, all third party software - needs to be rebuilt and re-installed. This is required as - installed software may depend on libraries which have been - removed during the upgrade process. This process can be - automated using - ports-mgmt/portmaster: + Generally, + installed applications will continue to work without problems + after minor version upgrades. Major versions use different + Application Binary Interfaces (ABIs), which + which will break most third-party + applications. After a + major version upgrade, all installed packages and + ports need to be upgraded using a utility such as + ports-mgmt/portmaster. A + rebuild of all installed applications can be + accomplished with this command: + + &prompt.root; portmaster -af - &prompt.root; portmaster -af + This command will display the configuration screens for + each application that has configurable options and wait for the user to interact with those + screens. To prevent this behavior, and use only the default + options, include in the above command. Once this has completed, finish the upgrade process with a final call to freebsd-update in order