From e85f1751ede1bca60dc4591a047db56f0cf7a3b8 Mon Sep 17 00:00:00 2001 From: Dru Lavigne Date: Thu, 6 Feb 2014 01:58:10 +0000 Subject: [PATCH] White space fix only. Translators can ignore. Sponsored by: iXsystems --- .../books/handbook/cutting-edge/chapter.xml | 209 +++++++++--------- 1 file changed, 107 insertions(+), 102 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml index 563d441cf8..9c2c604b53 100644 --- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml @@ -1439,51 +1439,53 @@ before running "/usr/sbin/freebsd-update install" particular version of &os; such as &os.stable; or &os.current;, the source tree can be used to rebuild the system. This process is known as rebuilding world. - + Before rebuilding world, be sure to perform the following tasks: - Perform These Tasks <emphasis>Before</emphasis> Building World + Perform These Tasks <emphasis>Before</emphasis> + Building World Backup all important data to another system or removable - media, verify the integrity of the backup, and have a bootable - installation media at hand. It cannot be - stressed enough how important it is to make a - backup of the system before rebuilding - the system. While rebuilding world is an easy task, there - will inevitably be times when mistakes in the source tree - render the system unbootable. You will probably never have - to use the backup, but it is better to be safe than sorry! - + media, verify the integrity of the backup, and have a + bootable installation media at hand. It cannot be stressed + enough how important it is to make a backup of the system + before rebuilding the system. While + rebuilding world is an easy task, there will inevitably be + times when mistakes in the source tree render the system + unbootable. You will probably never have to use the backup, + but it is better to be safe than sorry! + - - mailing list - Review the recent &a.stable.name; or &a.current.name; entries, depending - upon the branch being tracked. Be aware of any known - problems and which systems are affected. If a known issue - affects the version of synchronized code, wait for an all - clear announcement to be posted stating that the problem has - been solved. Resynchronize the sources to ensure that the - local version of source has the needed fix. - - - - Read - /usr/src/UPDATING for any pre-buildworld - steps necessary for that version of the source. This file contains - important information about potential problems and may specify - the order to run certain commands. Many upgrades require - specific additional steps such as renaming or deleting - specific files prior to installworld. These will be listed - at the end of this file where the currently recommended upgrade sequence - is explicitly spelled out. If - UPDATING contradicts any steps in - this chapter, the instructions in UPDATING take - precedence and should be followed. - - + + mailing list + Review the recent &a.stable.name; or &a.current.name; + entries, depending upon the branch being tracked. Be aware + of any known problems and which systems are affected. If a + known issue affects the version of synchronized code, wait + for an all clear announcement to be posted + stating that the problem has been solved. Resynchronize the + sources to ensure that the local version of source has the + needed fix. + + + + Read /usr/src/UPDATING for any + pre-buildworld steps necessary for that version of the + source. This file contains important information about + potential problems and may specify the order to run certain + commands. Many upgrades require specific additional steps + such as renaming or deleting specific files prior to + installworld. These will be listed at the end of this file + where the currently recommended upgrade sequence is + explicitly spelled out. If + UPDATING contradicts any steps in this + chapter, the instructions in UPDATING + take precedence and should be followed. + + Do Not Use <command>make world</command> @@ -1499,112 +1501,116 @@ before running "/usr/sbin/freebsd-update install" Overview of Process - The build world process assumes an upgrade from an older &os; - version using the source of a newer - version that was obtained using the instructions in + The build world process assumes an upgrade from an older + &os; version using the source of a newer version that was + obtained using the instructions in . - - In &os;, the term world includes the kernel, core system binaries, - libraries, programming files, and built-in compiler. The order in which these - components are built and installed is important. - - For example, the old compiler might have a bug and not be able to - compile the new kernel. Since the new kernel should be - built with the new compiler, the new compiler - must be built, but not necessarily installed, before the new kernel is built. - The new world might rely on new kernel features, - so the new kernel must be installed before the new world is - installed. The old world might not run correctly on the new - kernel, so the new world must be installed immediately - upon installing the new kernel. + In &os;, the term world includes the + kernel, core system binaries, libraries, programming files, + and built-in compiler. The order in which these components + are built and installed is important. - Some configuration changes must be made before the new - world is installed, but others might break the old world. - Hence, two different configuration upgrade steps are - used. For the most part, the update process only replaces or - adds files and existing old files are not deleted. Since - this can cause problems, /usr/src/UPDATING - will indicate if any files - need to be manually deleted and at which step to do so. + For example, the old compiler might have a bug and not be + able to compile the new kernel. Since the new kernel should + be built with the new compiler, the new compiler must be + built, but not necessarily installed, before the new kernel is + built. + + The new world might rely on new kernel features, so the + new kernel must be installed before the new world is + installed. The old world might not run correctly on the new + kernel, so the new world must be installed immediately upon + installing the new kernel. + + Some configuration changes must be made before the new + world is installed, but others might break the old world. + Hence, two different configuration upgrade steps are used. + For the most part, the update process only replaces or adds + files and existing old files are not deleted. Since this can + cause problems, /usr/src/UPDATING will + indicate if any files need to be manually deleted and at which + step to do so. These concerns have led to the recommended upgrade sequence described in the following procedure. - - Overview of Build World Process + + Overview of Build World Process - The commands used in the build world process should be run in the order specified - here. This section summarizes the function of each command. + The commands used in the build world process should be + run in the order specified here. This section summarizes + the function of each command. Compile the new compiler and a few related tools, then use the new compiler to compile the rest of the new world. The result is saved to /usr/obj. - + &prompt.root; cd /usr/src &prompt.root; make buildworld - Use the new compiler - residing in /usr/obj - to build the new kernel, in order to - protect against compiler-kernel mismatches: + Use the new compiler residing in /usr/obj to build the new + kernel, in order to protect against compiler-kernel + mismatches: &prompt.root; make buildkernel - Install the new kernel and kernel modules, - making it possible to boot with the newly updated - kernel: + Install the new kernel and kernel modules, making it + possible to boot with the newly updated kernel: &prompt.root; make installkernel - Drop the system into single user mode in order to minimize problems from updating - any binaries that are already running. It also minimizes any - problems from running the old world on a new - kernel. + Drop the system into single user mode in order to + minimize problems from updating any binaries that are + already running. It also minimizes any problems from + running the old world on a new kernel. &prompt.root; shutdown now Once in single-user mode, run this command if the system is formatted with UFS: - &prompt.root; mount -u / + &prompt.root; mount -u / &prompt.root; mount -a -t ufs - If the system is instead formatted with ZFS, run these - two commands. This example assumes a zpool name of zroot: + If the system is instead formatted with ZFS, run these + two commands. This example assumes a zpool name of + zroot: - &prompt.root; zfs set readonly=off zroot + &prompt.root; zfs set readonly=off zroot &prompt.root; zfs mount -a - + Then, for either filesystem, run: + &prompt.root; adjkerntz -i - + - Next, perform some initial configuration file updates in - preparation for the new world. For instance, this step may add - new groups or new system accounts which have been added - to &os; since the last update. This is necessary so that the - installworld step will be able - to use the new system accounts and groups. + Next, perform some initial configuration file updates + in preparation for the new world. For instance, this step + may add new groups or new system accounts which have been + added to &os; since the last update. This is necessary so + that the installworld step will + be able to use the new system accounts and groups. &prompt.root; mergemaster -p - Install the new world - from /usr/obj. + Install the new world from /usr/obj. &prompt.root; cd /usr/src &prompt.root; make installworld @@ -1617,26 +1623,25 @@ before running "/usr/sbin/freebsd-update install" - Delete any obsolete files. This is - important as they may cause problems if left on - the disk. + Delete any obsolete files. This is important as they + may cause problems if left on the disk. &prompt.root; make delete-old - A full reboot is now needed to load the new - kernel and new world with the new configuration files. + A full reboot is now needed to load the new kernel and + new world with the new configuration files. &prompt.root; reboot - Make sure that all installed ports have first been rebuilt - before old libraries are removed using the instructions in - . When finished, - remove any obsolete libraries to avoid conflicts with - newer ones. + Make sure that all installed ports have first been + rebuilt before old libraries are removed using the + instructions in . When + finished, remove any obsolete libraries to avoid conflicts + with newer ones. &prompt.root; make delete-old-libs