From owner-svn-doc-projects@FreeBSD.ORG Wed Feb 26 04:16:31 2014 Return-Path: Delivered-To: svn-doc-projects@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 5025A109; Wed, 26 Feb 2014 04:16:31 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3510116DC; Wed, 26 Feb 2014 04:16:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q4GV97093560; Wed, 26 Feb 2014 04:16:31 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q4GSmB093539; Wed, 26 Feb 2014 04:16:28 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402260416.s1Q4GSmB093539@svn.freebsd.org> From: Glen Barber Date: Wed, 26 Feb 2014 04:16:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44072 - in projects/relnotes-restructure: en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/articles/nanobsd en_US.ISO8859-1/books/faq en_... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 04:16:31 -0000 Author: gjb Date: Wed Feb 26 04:16:27 2014 New Revision: 44072 URL: http://svnweb.freebsd.org/changeset/doc/44072 Log: MFH up to r44071. Pull mergeinfo to top-level directory. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Added: projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/appendices/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/appendices/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/chapters.ent - copied unchanged from r44071, head/ru_RU.KOI8-R/books/porters-handbook/chapters.ent projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/keeping-up/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/keeping-up/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/makefiles/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/makefiles/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/new-port/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/new-port/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/pkg-files/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/pkg-files/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/plist/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/plist/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-dads/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-dads/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-why/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-why/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/quick-porting/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/quick-porting/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/security/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/security/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/slow-porting/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/slow-porting/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/special/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/special/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/testing/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/testing/ projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/upgrading/ - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/upgrading/ projects/relnotes-restructure/share/pgpkeys/truckman.key - copied unchanged from r44071, head/share/pgpkeys/truckman.key Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/versions.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/relnotes-restructure/en_US.ISO8859-1/htdocs/developers/cvs.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/docs/books.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/donations/donors.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/features.xml projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/index.xml projects/relnotes-restructure/fr_FR.ISO8859-1/share/xml/l10n.ent projects/relnotes-restructure/ja_JP.eucJP/articles/contributors/Makefile projects/relnotes-restructure/ja_JP.eucJP/articles/contributors/article.xml projects/relnotes-restructure/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/mirrors/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/ports/chapter.xml projects/relnotes-restructure/ja_JP.eucJP/books/handbook/preface/preface.xml projects/relnotes-restructure/ja_JP.eucJP/htdocs/developers/cvs.xml projects/relnotes-restructure/ja_JP.eucJP/htdocs/docs/books.xml projects/relnotes-restructure/ja_JP.eucJP/htdocs/ports/installing.xml projects/relnotes-restructure/ja_JP.eucJP/share/xml/libcommon.xsl projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/Makefile projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/uses.xml projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/versions.xml projects/relnotes-restructure/ru_RU.KOI8-R/htdocs/releases/index.xml projects/relnotes-restructure/ru_RU.KOI8-R/share/xml/l10n.ent projects/relnotes-restructure/share/misc/docbook.css projects/relnotes-restructure/share/pgpkeys/lioux.key projects/relnotes-restructure/share/pgpkeys/pgpkeys-developers.xml projects/relnotes-restructure/share/pgpkeys/pgpkeys.ent projects/relnotes-restructure/share/tools/webupdate (contents, props changed) projects/relnotes-restructure/share/tools/webupdate.wrapper projects/relnotes-restructure/share/xml/commercial.consult.xml projects/relnotes-restructure/share/xml/commercial.isp.xml projects/relnotes-restructure/share/xml/libcommon.xsl projects/relnotes-restructure/share/xml/man-refs.ent projects/relnotes-restructure/share/xml/mirrors.xml Directory Properties: projects/relnotes-restructure/ (props changed) projects/relnotes-restructure/en_US.ISO8859-1/ (props changed) projects/relnotes-restructure/fr_FR.ISO8859-1/ (props changed) projects/relnotes-restructure/ja_JP.eucJP/ (props changed) projects/relnotes-restructure/ru_RU.KOI8-R/ (props changed) projects/relnotes-restructure/share/ (props changed) Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -446,18 +446,6 @@ You need a Passphrase to protect your se The first real SVN commit is r300894. - There are mechanisms in place to automatically merge - changes back from the Subversion src - repository to the CVS repository for - some &os; branches (releng/6 through - releng/9), however this is purely to - support pre-existing end-user installs and should not be - relied upon, recommended or advertised. Future branches - will not be exported to CVS at all. The - ports repository was exported to CVS - for a period of time to aid end user migration, but as of - 28th February 2013 is no longer exported. - Subversion is not that different from CVS when it comes to daily use, but there are differences. Subversion has a number of features that @@ -2118,9 +2106,6 @@ U stable/9/share/man/man4/netmap.4 In commit logs etc., rev 179872 should be spelled r179872 as per convention. - Do not remove and re-add the same file in a single commit - as this will break the CVS exporter. - Speeding up svn is possible by adding the following to ~/.ssh/config: Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -40,7 +40,7 @@ &a.itojun.email; (1997 - 2001; RIP 2008) Known to everyone as itojun, - Jun-ichiro Hagino was was a core researcher at the + Jun-ichiro Hagino was a core researcher at the KAME Project, which aimed to provide IPv6 and IPsec technology in freely redistributable form. Much of this code was incorporated Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -350,37 +350,36 @@ NANO_KERNEL=MYKERNEL NANO_IMAGES=2 CONF_BUILD=' -NO_KLDLOAD=YES -NO_NETGRAPH=YES -NO_PAM=YES +WITHOUT_KLDLOAD=YES +WITHOUT_NETGRAPH=YES +WITHOUT_PAM=YES ' CONF_INSTALL=' -NO_ACPI=YES -NO_BLUETOOTH=YES -NO_CVS=YES -NO_FORTRAN=YES -NO_HTML=YES -NO_LPR=YES -NO_MAN=YES -NO_SENDMAIL=YES -NO_SHAREDOCS=YES -NO_EXAMPLES=YES -NO_INSTALLLIB=YES -NO_CALENDAR=YES -NO_MISC=YES -NO_SHARE=YES +WITHOUT_ACPI=YES +WITHOUT_BLUETOOTH=YES +WITHOUT_FORTRAN=YES +WITHOUT_HTML=YES +WITHOUT_LPR=YES +WITHOUT_MAN=YES +WITHOUT_SENDMAIL=YES +WITHOUT_SHAREDOCS=YES +WITHOUT_EXAMPLES=YES +WITHOUT_INSTALLLIB=YES +WITHOUT_CALENDAR=YES +WITHOUT_MISC=YES +WITHOUT_SHARE=YES ' CONF_WORLD=' -NO_BIND=YES -NO_MODULES=YES -NO_KERBEROS=YES -NO_GAMES=YES -NO_RESCUE=YES -NO_LOCALES=YES -NO_SYSCONS=YES -NO_INFO=YES +WITHOUT_BIND=YES +WITHOUT_MODULES=YES +WITHOUT_KERBEROS=YES +WITHOUT_GAMES=YES +WITHOUT_RESCUE=YES +WITHOUT_LOCALES=YES +WITHOUT_SYSCONS=YES +WITHOUT_INFO=YES ' FlashDevice SanDisk 1G Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -2,25 +2,26 @@ - -10-CURRENT"> -X"> + +11-CURRENT"> +X"> head/"> - -X"> -9-STABLE"> -stable/9/"> - - -X"> -8-STABLE"> -stable/8/"> - - +X"> +10-STABLE"> +stable/10/"> + +X"> +9-STABLE"> +stable/9/"> + +X"> +8-STABLE"> +stable/8/"> + ]> Frequently Asked Questions for &os; - &rel2.relx;, &rel.relx; and &rel.head.relx; + &rel3.relx;, &rel2.relx; and &rel.relx; The &os; Documentation Project @@ -45,6 +46,7 @@ 2011 2012 2013 + 2014 The &os; Documentation Project @@ -68,7 +70,7 @@ $FreeBSD$ - This is the FAQ for &os; versions &rel2.relx; and + This is the FAQ for &os; versions &rel3.relx;, &rel2.relx; and &rel.relx;. Every effort has been made to make this FAQ as informative as possible; if you have any suggestions as to how it may be improved, please feel free to mail them to the @@ -2381,7 +2383,7 @@ kern.timecounter.hardware: TSC -> i82 periodic updates on new entries. Most ports should work on the - &rel2.relx;, and &rel.relx; branches. + &rel3.relx;, &rel2.relx;, and &rel.relx; branches. Each time a &os; release is made, a snapshot of the ports tree at the time of release in also included in the ports/ @@ -2395,40 +2397,13 @@ kern.timecounter.hardware: TSC -> i82 to know the gory details of which files it includes. Use - &man.pkg.add.1; on the specific package files + &man.pkg.7; on the specific package files you are interested in installing. Package files can usually - be identified by their .tbz suffix and + be identified by their .txz suffix and CD-ROM distribution people will have a packages/All directory on their CD which contains such files. They can also be downloaded over - the net for various versions of &os; at the following - locations: - - - - for &rel2.relx; -RELEASE/&rel2.stable; - - - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages; - - - - - for &rel.relx; -RELEASE/&rel.stable; - - - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages; - - - - - or your nearest local mirror site. - - Note that all ports may not be available as packages - since new ones are constantly being added. It is always a - good idea to check back periodically to see which packages - are available at the ftp.FreeBSD.org - master site. + the net for various versions of &os;. @@ -7653,6 +7628,11 @@ hint.sio.7.irq="12" + &rel3.releng; AKA + &rel3.stable; + + + &rel2.releng; AKA &rel2.stable; Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -92,7 +92,7 @@ Make includes are the glue that perform the document production, and are usually of the form - doc.xxx.mk. + doc.xxx.mk. @@ -338,9 +338,9 @@ PRI_LANG?= en_US.ISO8859-1 Targets and Macros Dependencies are described by - target: - dependency1 dependency2 - ... tuples, where to build + target: + dependency1 dependency2 + ... tuples, where to build target, the given dependencies must be built first. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -196,7 +196,7 @@ - &man.command.sectionnumber; + &man.command.sectionnumber; link to command manual page in section @@ -232,7 +232,7 @@ - &a.listname; + &a.listname; link to listname Entities are defined for all the - &url.books.bookname; + &url.books.bookname; relative path to bookname Entities are defined for all the - &url.articles.articlename; + &url.articles.articlename; relative path to articlename Entities are defined for all the general entities have been created to make this easier. Each entity takes the form - &man.manual-page.manual-section;. + &man.manual-page.manual-section;. The file that contains these entities is in doc/share/xml/man-refs.ent, and can be @@ -1497,7 +1497,7 @@ This is the file called 'foo2' When referring to the same command multiple times in close proximity, it is preferred to use the - &man.command.section; + &man.command.section; notation to markup the first reference and use command to markup subsequent references. This makes the generated output, especially @@ -1549,7 +1549,7 @@ This is the file called 'foo2' Notice how the - &man.command.section; + &man.command.section; notation is easier to follow. @@ -1980,7 +1980,7 @@ This is the file called 'foo2' Appearance: The - maxusers n + maxusers n line in the kernel configuration file determines the size of many system tables, and is a rough guide to how many simultaneous logins the system will support. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -117,7 +117,7 @@ color ,yellow "^(.{71})|(TAB.{63})|(TAB{ Specify additional helpful options when running the editor: - &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml + &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml Users of &man.csh.1; can define an alias in ~/.cshrc to automate these @@ -128,7 +128,7 @@ color ,yellow "^(.{71})|(TAB.{63})|(TAB{ After the alias is defined, the options will be added automatically: - &prompt.user; nano chapter.xml + &prompt.user; nano chapter.xml Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -171,7 +171,7 @@ -c /usr/local/share/xml/docbook/catalog \ -c /usr/local/share/xml/jade/catalog \ -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.xml > file.html + -t sgml file.xml > file.html @@ -226,7 +226,7 @@ -c /usr/local/share/xml/docbook/catalog \ -c /usr/local/share/xml/jade/catalog \ -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.xml + -t sgml file.xml @@ -283,7 +283,7 @@ -c /usr/local/share/xml/docbook/catalog \ -c /usr/local/share/xml/jade/catalog \ -d /usr/local/share/xml/docbook/dsssl/modular/print/docbook.dsl \ - -t tex file.xml + -t tex file.xml @@ -319,7 +319,7 @@ run through tex, specifying the &jadetex macro package. - &prompt.user; tex "&jadetex" file.tex + &prompt.user; tex "&jadetex" file.tex tex commands must be run at least three times. The first run @@ -341,12 +341,12 @@ necessary. The output from this stage will be - file.dvi. + file.dvi. Finally, run dvips to convert the .dvi file to &postscript;. - &prompt.user; dvips -o file.ps file.dvi + &prompt.user; dvips -o file.ps file.dvi @@ -361,12 +361,12 @@ However, use the &pdfjadetex macro package instead. - &prompt.user; pdftex "&pdfjadetex" file.tex + &prompt.user; pdftex "&pdfjadetex" file.tex Again, run this command three times. This will generate - file.pdf, + file.pdf, which does not need to be processed any further. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -156,7 +156,7 @@ ~/doc (see ). - &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc + &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc @@ -184,7 +184,7 @@ Update the local working copy: - &prompt.user; svn up ~/doc + &prompt.user; svn up ~/doc @@ -224,7 +224,7 @@ diff file: &prompt.user; cd /usr/doc -&prompt.user; svn diff > bsdinstall.diff.txt +&prompt.user; svn diff > bsdinstall.diff.txt Give the diff file a descriptive name. In the example above, changes have been made to the Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -94,7 +94,8 @@ - lang.encoding + lang.encoding One directory exists for each available translation and encoding of the documentation, for example @@ -114,7 +115,7 @@ The - <filename>lang.encoding/</filename> + <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename> Directories These directories contain the documents themselves. The @@ -158,7 +159,7 @@ man For translations of the system manual pages. This - directory will contain one or more mann + directory will contain one or more mann directories, corresponding to the sections that have been translated. @@ -166,7 +167,7 @@ - Not every lang.encoding + Not every lang.encoding directory will have all of these subdirectories. It depends on how much translation has been accomplished by that translation team. @@ -236,7 +237,7 @@ - <filename>directory/chapter.xml</filename> + <filename role="directory"><replaceable>directory</replaceable>/chapter.xml</filename> Each chapter in the Handbook is stored in a file called chapter.xml in a separate Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -38,7 +38,7 @@ Having obtained the documentation and web site source files, the web site can be built. In this example, the build directory - is ~/doc + is ~/doc and all the required files are already in place. The web site is built from the @@ -76,7 +76,7 @@ jru in their home directory, /usr/home/jru/doc. &prompt.root; cd /home/jru/doc/en_US.ISO8859-1/htdocs -&prompt.root; env DESTDIR=/usr/local/www make install +&prompt.root; env DESTDIR=/usr/local/www make install The install process will not delete any old or outdated files that existed previously in the same directory. If a new @@ -84,7 +84,7 @@ will find and delete all files that have not been updated in three days. - &prompt.root; find /usr/local/www -ctime 3 -delete + &prompt.root; find /usr/local/www -ctime 3 -delete @@ -129,7 +129,7 @@ If set, build or install only for the languages - specified by this variable inside the ~/doc + specified by this variable inside the ~/doc directory. All other languages except English will be ignored. E.g.: Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -135,7 +135,7 @@ copy of the FreeBSD Subversion repository (at least the documentation part). This can be done by running: - &prompt.user; svn checkout https://svn0.us-east.FreeBSD.org/doc/head/ head + &prompt.user; svn checkout https://svn0.us-east.FreeBSD.org/doc/head/ head svn0.us-east.FreeBSD.org is a public SVN server. @@ -158,7 +158,7 @@ en_US.ISO8859-1/books/fdp-primer/book.xml, run: - &prompt.user; svn diff -r33733:33734 en_US.ISO8859-1/books/fdp-primer/book.xml + &prompt.user; svn diff -r33733:33734 en_US.ISO8859-1/books/fdp-primer/book.xml @@ -284,7 +284,7 @@ sv_SE.ISO8859-1 is the name of the translation, in - lang.encoding + lang.encoding form. Note the two Makefiles, which will be used to build the documentation. @@ -465,7 +465,7 @@ Your translated documents should include their own $FreeBSD$ line, and change the FreeBSD Documentation Project line to - The FreeBSD language + The FreeBSD language Documentation Project. In addition, you should add a third line which indicates Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -98,12 +98,12 @@ copy of the latest version (head) of the main documentation tree: - &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc + &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc A checkout of the source code to work on manual pages is very similar: - &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/base/head ~/src + &prompt.user; svn checkout https://svn0.us-west.FreeBSD.org/base/head ~/src @@ -118,7 +118,7 @@ svn update on the directory containing the local working copy: - &prompt.user; svn update ~/doc + &prompt.user; svn update ~/doc Get in the protective habit of using svn update before editing document files. @@ -152,8 +152,8 @@ by redirecting the output of svn diff into a file: - &prompt.user; cd ~/doc -&prompt.user; svn diff > doc-fix-spelling.diff + &prompt.user; cd ~/doc +&prompt.user; svn diff > doc-fix-spelling.diff Give the file a meaningful name that identifies the contents. The example above is for spelling fixes to the whole @@ -172,8 +172,8 @@ be submitted yet, provide a list of only the files that are to be included: - &prompt.user; cd ~/doc -&prompt.user; svn diff disks/chapter.xml printers/chapter.xml > disks-printers.diff + &prompt.user; cd ~/doc +&prompt.user; svn diff disks/chapter.xml printers/chapter.xml > disks-printers.diff Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -312,7 +312,7 @@ An element's attributes are written inside the start tag for that element, and take the form - attribute-name="attribute-value". + attribute-name="attribute-value". In XHTML, the p element has an attribute called @@ -615,9 +615,9 @@ example.xml:5: element head: validity er superset) of XML. Otherwise, this string will either look like - -//Owner + -//Owner or - +//Owner + +//Owner (notice the only difference is the leading + or -). @@ -898,7 +898,7 @@ example.xml:5: element head: validity er To include the text of a general entity in the document, include - &entity-name; + &entity-name; in the text. For example, consider a general entity called current.version which expands to the current version number of a product. To use it in the @@ -962,7 +962,7 @@ example.xml:5: element head: validity er Parameter entity definitons are similar to those for general entities. However, parameter entries are included with - %entity-name;. + %entity-name;. The definition also includes the % between the ENTITY keyword and the name of the entity. @@ -1226,7 +1226,7 @@ example.xml:5: element head: validity er Load example.html into the web browser and confirm that the - paran.xml + paran.xml files have been included in example.html. @@ -1287,7 +1287,7 @@ example.xml:5: element head: validity er Load example.html into the web browser and confirm that the - paran.xml + paran.xml files have been included in example.html. Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Feb 26 04:13:22 2014 (r44071) +++ projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml Wed Feb 26 04:16:27 2014 (r44072) @@ -4,7 +4,10 @@ $FreeBSD$ --> - + + Advanced Networking @@ -89,15 +92,26 @@ Gateways and Routes - - CoranthGryphonContributed - by + + + + Coranth + Gryphon + + Contributed by + - routing - gateway - subnet + + routing + + + gateway + + + subnet + For one machine to be able to find another over a network, there must be a mechanism in place to describe how to get from @@ -135,12 +149,18 @@ host2 0:e0:a8:37:8:1e UHLW host2.example.com link#1 UC 0 0 224 link#1 UC 0 0 - default route + + default route + + The first two lines specify the default route, described in more detail in , and the localhost route. - loopback device + + loopback device + + The interface (Netif column) that this routing table specifies to use for localhost is lo0, @@ -152,6 +172,7 @@ host2.example.com link#1 UC Ethernet MAC address + The addresses beginning with 0:e0: are Ethernet hardware addresses, also known as MAC @@ -167,7 +188,9 @@ host2.example.com link#1 UC calculates routes to local hosts based upon a shortest path determination. - subnet + + subnet + &os; will add subnet routes for the local subnet. 10.20.30.255 is the @@ -263,7 +286,9 @@ host2.example.com link#1 UC Default Routes - default route + + default route + When the local system needs to make a connection to a remote host, it checks the routing table to determine if a @@ -400,9 +425,11 @@ host2.example.com link#1 UC Dual Homed Hosts - dual homed hosts + + dual homed hosts + - A a dual-homed system is a host which resides on two + A dual-homed system is a host which resides on two different networks. The dual-homed machine might have two Ethernet cards, each @@ -428,7 +455,9 @@ host2.example.com link#1 UC Building a Router - router + + router + A network router is a system that forwards packets from one interface to another. Internet standards and good @@ -444,9 +473,16 @@ host2.example.com link#1 UC 1. To stop routing, reset this to 0. - BGP - RIP - OSPF + + BGP + + + RIP + + + OSPF + + The new router will need routes to know where to send the traffic. If the network is simple enough, static routes can be used. &os; comes with the standard BSD routing daemon @@ -463,8 +499,13 @@ host2.example.com link#1 UC Setting Up Static Routes - AlHoangContributed - by + + + Al + Hoang + + Contributed by + @@ -641,6 +682,7 @@ route_net2="-net 192.168.1.0/24 192.168. kernel options MROUTING + &os; natively supports both multicast applications and multicast routing. Multicast applications do not require any special configuration of &os;; as applications will generally @@ -672,15 +714,29 @@ route_net2="-net 192.168.1.0/24 192.168. Wireless Networking - Loader - - MarcFonvieille - - MurrayStokely + + + Loader + + + + + Marc + Fonvieille + + + + + Murray + Stokely + + - wireless networking + + wireless networking + 802.11 wireless networking @@ -2239,7 +2295,9 @@ freebsdap 00:11:95:c3:0d:ac 1 USB Tethering - tether + + tether + Many cellphones provide the option to share their data connection over USB (often called "tethering"). This feature @@ -2264,14 +2322,21 @@ freebsdap 00:11:95:c3:0d:ac 1 Bluetooth - PavLucistnikWritten - by -
pav@FreeBSD.org
- + + + Pav + Lucistnik + + Written by + pav@FreeBSD.org + - Bluetooth + + Bluetooth + + Introduction @@ -2343,7 +2408,9 @@ Number of SCO packets: 8 Host Controller Interface (<acronym>HCI</acronym>) - HCI + + HCI + The Host Controller Interface (HCI) provides a command interface to the baseband controller and @@ -2404,8 +2471,8 @@ Name: Pav's T39 If an inquiry is performed on a remote Bluetooth device, it will find the computer as - your.host.name (ubt0). The name assigned to the - local device can be changed at any time. + your.host.name (ubt0). The name assigned to + the local device can be changed at any time. The Bluetooth system provides a point-to-point connection between two Bluetooth units, or a point-to-multipoint @@ -2437,7 +2504,9 @@ Reason: Connection terminated by local h Logical Link Control and Adaptation Protocol (<acronym>L2CAP</acronym>) - L2CAP + + L2CAP + The Logical Link Control and Adaptation Protocol (L2CAP) provides connection-oriented and @@ -2611,7 +2680,9 @@ hcsecd[16484]: Sending PIN_Code_Reply to Service Discovery Protocol (<acronym>SDP</acronym>) - SDP + + SDP + The Service Discovery Protocol (SDP) provides the means for client applications to discover the @@ -2795,7 +2866,10 @@ Bluetooth Profile Descriptor List: <acronym>OBEX</acronym> Object Push (<acronym>OPUSH</acronym>) Profile - OBEX + + OBEX + + OBEX is a widely used protocol for simple file transfers between mobile devices. Its main use is in infrared communication, where it is used for generic @@ -2915,17 +2989,26 @@ rfcomm_sppd[94692]: Starting on /dev/tty Bridging - AndrewThompsonWritten - by + + + Andrew + Thompson + + Written by + Introduction - IP - subnet - bridge + + IP subnet + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Feb 26 04:13:23 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5968DEEF; Wed, 26 Feb 2014 04:13:23 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2AB9E16D2; Wed, 26 Feb 2014 04:13:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q4DNZZ093026; Wed, 26 Feb 2014 04:13:23 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q4DMUZ093025; Wed, 26 Feb 2014 04:13:22 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402260413.s1Q4DMUZ093025@svn.freebsd.org> From: Glen Barber Date: Wed, 26 Feb 2014 04:13:22 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44071 - in projects/sysctl: bn_BD.ISO10646-1 zh_CN.GB2312 X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 04:13:23 -0000 Author: gjb Date: Wed Feb 26 04:13:22 2014 New Revision: 44071 URL: http://svnweb.freebsd.org/changeset/doc/44071 Log: Chase down remnants from r44070 that should have been removed. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Deleted: projects/sysctl/bn_BD.ISO10646-1/ projects/sysctl/zh_CN.GB2312/ From owner-svn-doc-projects@FreeBSD.ORG Wed Feb 26 04:10:51 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69AF5D8B; Wed, 26 Feb 2014 04:10:51 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5172F1664; Wed, 26 Feb 2014 04:10:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q4Apm0090495; Wed, 26 Feb 2014 04:10:51 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q4ApcD090492; Wed, 26 Feb 2014 04:10:51 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201402260410.s1Q4ApcD090492@svn.freebsd.org> From: Glen Barber Date: Wed, 26 Feb 2014 04:10:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44070 - in projects/sysctl: bn_BD.UTF-8/articles de_DE.ISO8859-1/books/handbook/backups de_DE.ISO8859-1/books/handbook/introduction de_DE.ISO8859-1/books/handbook/sound de_DE.ISO8859-1... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 04:10:51 -0000 Author: gjb Date: Wed Feb 26 04:10:49 2014 New Revision: 44070 URL: http://svnweb.freebsd.org/changeset/doc/44070 Log: MFH up to r44069. Pull mergeinfo to top-level directory. (And hope that this actually does build.) Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Added: - copied from r43188, head/bn_BD.UTF-8/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/appendices/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/appendices/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/chapters.ent - copied unchanged from r44069, head/en_US.ISO8859-1/books/porters-handbook/chapters.ent projects/sysctl/en_US.ISO8859-1/books/porters-handbook/keeping-up/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/keeping-up/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/makefiles/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/makefiles/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/new-port/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/new-port/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/pkg-files/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/pkg-files/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/plist/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/plist/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/porting-dads/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/porting-dads/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/porting-samplem/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/porting-samplem/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/porting-why/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/porting-why/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/quick-porting/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/quick-porting/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/security/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/security/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/slow-porting/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/slow-porting/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/special/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/special/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/testing/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/testing/ projects/sysctl/en_US.ISO8859-1/books/porters-handbook/upgrading/ - copied from r44069, head/en_US.ISO8859-1/books/porters-handbook/upgrading/ projects/sysctl/en_US.ISO8859-1/htdocs/internal/software-license.xml - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/internal/software-license.xml projects/sysctl/en_US.ISO8859-1/htdocs/logo/logo-simple.svg - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/logo/logo-simple.svg projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-09-devsummit.xml - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/news/status/report-2013-09-devsummit.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2013-10-2013-12.xml - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/news/status/report-2013-10-2013-12.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/announce.xml - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/releases/10.0R/announce.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/hardware.html - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/releases/10.0R/hardware.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/installation.html - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/releases/10.0R/installation.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/readme.html - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/releases/10.0R/readme.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/relnotes.html - copied unchanged from r44069, head/en_US.ISO8859-1/htdocs/releases/10.0R/relnotes.html projects/sysctl/ja_JP.eucJP/htdocs/releases/10.0R/ - copied from r44069, head/ja_JP.eucJP/htdocs/releases/10.0R/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/appendices/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/appendices/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/chapters.ent - copied unchanged from r44069, head/ru_RU.KOI8-R/books/porters-handbook/chapters.ent projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/keeping-up/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/keeping-up/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/makefiles/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/makefiles/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/new-port/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/new-port/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/pkg-files/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/pkg-files/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/plist/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/plist/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/porting-dads/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/porting-dads/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/porting-why/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/porting-why/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/quick-porting/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/quick-porting/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/security/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/security/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/slow-porting/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/slow-porting/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/special/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/special/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/testing/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/testing/ projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/upgrading/ - copied from r44069, head/ru_RU.KOI8-R/books/porters-handbook/upgrading/ projects/sysctl/share/pgpkeys/checkkey.sh - copied unchanged from r44069, head/share/pgpkeys/checkkey.sh projects/sysctl/share/pgpkeys/dumbbell.key - copied unchanged from r44069, head/share/pgpkeys/dumbbell.key projects/sysctl/share/pgpkeys/dvl.key - copied unchanged from r44069, head/share/pgpkeys/dvl.key projects/sysctl/share/pgpkeys/gonzo.key - copied unchanged from r44069, head/share/pgpkeys/gonzo.key projects/sysctl/share/pgpkeys/grembo.key - copied unchanged from r44069, head/share/pgpkeys/grembo.key projects/sysctl/share/pgpkeys/milki.key - copied unchanged from r44069, head/share/pgpkeys/milki.key projects/sysctl/share/pgpkeys/riggs.key - copied unchanged from r44069, head/share/pgpkeys/riggs.key projects/sysctl/share/pgpkeys/rodrigo.key - copied unchanged from r44069, head/share/pgpkeys/rodrigo.key projects/sysctl/share/pgpkeys/royger.key - copied unchanged from r44069, head/share/pgpkeys/royger.key projects/sysctl/share/pgpkeys/truckman.key - copied unchanged from r44069, head/share/pgpkeys/truckman.key projects/sysctl/share/security/advisories/FreeBSD-EN-13:05.freebsd-update.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-EN-13:05.freebsd-update.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:01.random.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-EN-14:01.random.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:02.mmap.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-EN-14:02.mmap.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:01.bsnmpd.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-SA-14:01.bsnmpd.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:02.ntpd.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-SA-14:02.ntpd.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:03.openssl.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-SA-14:03.openssl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:04.bind.asc - copied unchanged from r44069, head/share/security/advisories/FreeBSD-SA-14:04.bind.asc projects/sysctl/share/security/patches/EN-13:05/ - copied from r44069, head/share/security/patches/EN-13:05/ projects/sysctl/share/security/patches/EN-14:01/ - copied from r44069, head/share/security/patches/EN-14:01/ projects/sysctl/share/security/patches/EN-14:02/ - copied from r44069, head/share/security/patches/EN-14:02/ projects/sysctl/share/security/patches/SA-14:01/ - copied from r44069, head/share/security/patches/SA-14:01/ projects/sysctl/share/security/patches/SA-14:02/ - copied from r44069, head/share/security/patches/SA-14:02/ projects/sysctl/share/security/patches/SA-14:03/ - copied from r44069, head/share/security/patches/SA-14:03/ projects/sysctl/share/security/patches/SA-14:04/ - copied from r44069, head/share/security/patches/SA-14:04/ - copied from r43188, head/zh_CN.UTF-8/ Directory Properties: projects/sysctl/bn_BD.UTF-8/ (props changed) projects/sysctl/zh_CN.UTF-8/ (props changed) Deleted: projects/sysctl/de_DE.ISO8859-1/books/handbook/backups/ projects/sysctl/de_DE.ISO8859-1/books/handbook/sound/ projects/sysctl/de_DE.ISO8859-1/books/handbook/updating/ projects/sysctl/en_US.ISO8859-1/books/handbook/users/ projects/sysctl/en_US.ISO8859-1/htdocs/donations/wantlist.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/java-rss.xsl projects/sysctl/en_US.ISO8859-1/htdocs/java/links.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/news.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/newsflash.xsl projects/sysctl/ja_JP.eucJP/htdocs/java/java-rss.xsl projects/sysctl/ja_JP.eucJP/htdocs/java/links.xml projects/sysctl/ja_JP.eucJP/htdocs/java/news.xml projects/sysctl/ja_JP.eucJP/htdocs/java/newsflash.xsl projects/sysctl/ru_RU.KOI8-R/books/handbook/users/ Modified: projects/sysctl/bn_BD.UTF-8/articles/Makefile.inc projects/sysctl/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml projects/sysctl/de_DE.ISO8859-1/htdocs/Makefile projects/sysctl/de_DE.ISO8859-1/htdocs/index.xsl projects/sysctl/de_DE.ISO8859-1/htdocs/releases/index.xml projects/sysctl/de_DE.ISO8859-1/htdocs/where.xml projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml projects/sysctl/de_DE.ISO8859-1/share/xml/press.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/Makefile projects/sysctl/el_GR.ISO8859-7/books/handbook/book.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/chapters.ent projects/sysctl/el_GR.ISO8859-7/books/handbook/disks/chapter.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/preface/preface.xml projects/sysctl/el_GR.ISO8859-7/share/xml/freebsd-xhtml.xsl projects/sysctl/en_US.ISO8859-1/articles/committers-guide/Makefile projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml projects/sysctl/en_US.ISO8859-1/articles/cvs-freebsd/article.xml projects/sysctl/en_US.ISO8859-1/articles/linux-users/article.xml projects/sysctl/en_US.ISO8859-1/articles/nanobsd/article.xml projects/sysctl/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml projects/sysctl/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml projects/sysctl/en_US.ISO8859-1/books/faq/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/audit/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/handbook/boot/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/colophon.xml projects/sysctl/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/geom/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/introduction/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/jails/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mac/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/Makefile projects/sysctl/en_US.ISO8859-1/books/porters-handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/versions.xml projects/sysctl/en_US.ISO8859-1/htdocs/administration.xml projects/sysctl/en_US.ISO8859-1/htdocs/cgi/GnatsPR/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl projects/sysctl/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/sysctl/en_US.ISO8859-1/htdocs/cgi/search.cgi projects/sysctl/en_US.ISO8859-1/htdocs/community/mailinglists.xml projects/sysctl/en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.xml projects/sysctl/en_US.ISO8859-1/htdocs/copyright/freebsd-license.xml projects/sysctl/en_US.ISO8859-1/htdocs/developers/cvs.xml projects/sysctl/en_US.ISO8859-1/htdocs/docs/books.xml projects/sysctl/en_US.ISO8859-1/htdocs/docs/webresources.xml projects/sysctl/en_US.ISO8859-1/htdocs/donations/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/donations/donors.xml projects/sysctl/en_US.ISO8859-1/htdocs/donations/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/events/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/features.xml projects/sysctl/en_US.ISO8859-1/htdocs/index.xsl projects/sysctl/en_US.ISO8859-1/htdocs/internal/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/internal/expire-bits.xml projects/sysctl/en_US.ISO8859-1/htdocs/internal/machines.xml projects/sysctl/en_US.ISO8859-1/htdocs/internal/policies.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/16.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/17.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/dists/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/java/install.xml projects/sysctl/en_US.ISO8859-1/htdocs/logo.xml projects/sysctl/en_US.ISO8859-1/htdocs/logo/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/news/news.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-sample.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report.xsl projects/sysctl/en_US.ISO8859-1/htdocs/news/status/status.xml projects/sysctl/en_US.ISO8859-1/htdocs/platforms/arm.xml projects/sysctl/en_US.ISO8859-1/htdocs/portmgr/qa.xml projects/sysctl/en_US.ISO8859-1/htdocs/ports/categories projects/sysctl/en_US.ISO8859-1/htdocs/ports/installing.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml projects/sysctl/en_US.ISO8859-1/htdocs/where.xml projects/sysctl/es_ES.ISO8859-1/htdocs/projects/projects.xml projects/sysctl/fr_FR.ISO8859-1/htdocs/Makefile projects/sysctl/fr_FR.ISO8859-1/share/xml/l10n.ent projects/sysctl/ja_JP.eucJP/articles/contributors/Makefile projects/sysctl/ja_JP.eucJP/articles/contributors/article.xml projects/sysctl/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/basics/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/book.xml projects/sysctl/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/colophon.xml projects/sysctl/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/desktop/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/eresources/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/install/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/mirrors/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/ports/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/preface/preface.xml projects/sysctl/ja_JP.eucJP/books/handbook/x11/chapter.xml projects/sysctl/ja_JP.eucJP/htdocs/community/mailinglists.xml projects/sysctl/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml projects/sysctl/ja_JP.eucJP/htdocs/developers/cvs.xml projects/sysctl/ja_JP.eucJP/htdocs/docs/books.xml projects/sysctl/ja_JP.eucJP/htdocs/events/Makefile projects/sysctl/ja_JP.eucJP/htdocs/index.xsl projects/sysctl/ja_JP.eucJP/htdocs/internal/machines.xml projects/sysctl/ja_JP.eucJP/htdocs/java/Makefile projects/sysctl/ja_JP.eucJP/htdocs/java/dists/index.xml projects/sysctl/ja_JP.eucJP/htdocs/java/index.xml projects/sysctl/ja_JP.eucJP/htdocs/java/install.xml projects/sysctl/ja_JP.eucJP/htdocs/news/news.xml projects/sysctl/ja_JP.eucJP/htdocs/platforms/arm.xml projects/sysctl/ja_JP.eucJP/htdocs/ports/installing.xml projects/sysctl/ja_JP.eucJP/htdocs/releases/Makefile projects/sysctl/ja_JP.eucJP/htdocs/releases/index.xml projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml projects/sysctl/ja_JP.eucJP/htdocs/where.xml projects/sysctl/ja_JP.eucJP/share/xml/header.l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/libcommon.xsl projects/sysctl/ja_JP.eucJP/share/xml/mailing-lists.ent projects/sysctl/ja_JP.eucJP/share/xml/navibar.l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/news.xml projects/sysctl/ru_RU.KOI8-R/articles/console-server/Makefile projects/sysctl/ru_RU.KOI8-R/articles/console-server/article.xml projects/sysctl/ru_RU.KOI8-R/articles/contributing/Makefile projects/sysctl/ru_RU.KOI8-R/articles/contributing/article.xml projects/sysctl/ru_RU.KOI8-R/articles/cups/Makefile projects/sysctl/ru_RU.KOI8-R/articles/cups/article.xml projects/sysctl/ru_RU.KOI8-R/articles/custom-gcc/Makefile projects/sysctl/ru_RU.KOI8-R/articles/custom-gcc/article.xml projects/sysctl/ru_RU.KOI8-R/articles/cvs-freebsd/Makefile projects/sysctl/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml projects/sysctl/ru_RU.KOI8-R/articles/explaining-bsd/Makefile projects/sysctl/ru_RU.KOI8-R/articles/explaining-bsd/article.xml projects/sysctl/ru_RU.KOI8-R/articles/fbsd-from-scratch/Makefile projects/sysctl/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml projects/sysctl/ru_RU.KOI8-R/articles/fonts/Makefile projects/sysctl/ru_RU.KOI8-R/articles/fonts/article.xml projects/sysctl/ru_RU.KOI8-R/articles/freebsd-questions/Makefile projects/sysctl/ru_RU.KOI8-R/articles/freebsd-questions/article.xml projects/sysctl/ru_RU.KOI8-R/articles/geom-class/Makefile projects/sysctl/ru_RU.KOI8-R/articles/geom-class/article.xml projects/sysctl/ru_RU.KOI8-R/articles/gjournal-desktop/Makefile projects/sysctl/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml projects/sysctl/ru_RU.KOI8-R/articles/hubs/Makefile projects/sysctl/ru_RU.KOI8-R/articles/hubs/article.xml projects/sysctl/ru_RU.KOI8-R/articles/ipsec-must/Makefile projects/sysctl/ru_RU.KOI8-R/articles/ipsec-must/article.xml projects/sysctl/ru_RU.KOI8-R/articles/laptop/Makefile projects/sysctl/ru_RU.KOI8-R/articles/laptop/article.xml projects/sysctl/ru_RU.KOI8-R/articles/linux-comparison/Makefile projects/sysctl/ru_RU.KOI8-R/articles/linux-comparison/article.xml projects/sysctl/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml projects/sysctl/ru_RU.KOI8-R/articles/mh/Makefile projects/sysctl/ru_RU.KOI8-R/articles/mh/article.xml projects/sysctl/ru_RU.KOI8-R/articles/new-users/article.xml projects/sysctl/ru_RU.KOI8-R/articles/pr-guidelines/Makefile projects/sysctl/ru_RU.KOI8-R/articles/pr-guidelines/article.xml projects/sysctl/ru_RU.KOI8-R/articles/problem-reports/Makefile projects/sysctl/ru_RU.KOI8-R/articles/problem-reports/article.xml projects/sysctl/ru_RU.KOI8-R/articles/relaydelay/Makefile projects/sysctl/ru_RU.KOI8-R/articles/relaydelay/article.xml projects/sysctl/ru_RU.KOI8-R/articles/releng-packages/Makefile projects/sysctl/ru_RU.KOI8-R/articles/releng-packages/article.xml projects/sysctl/ru_RU.KOI8-R/articles/releng/article.xml projects/sysctl/ru_RU.KOI8-R/articles/solid-state/Makefile projects/sysctl/ru_RU.KOI8-R/articles/solid-state/article.xml projects/sysctl/ru_RU.KOI8-R/articles/vm-design/Makefile projects/sysctl/ru_RU.KOI8-R/articles/vm-design/article.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/Makefile projects/sysctl/ru_RU.KOI8-R/books/handbook/basics/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/book.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/chapters.ent projects/sysctl/ru_RU.KOI8-R/books/handbook/preface/preface.xml projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/Makefile projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/book.xml projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/uses.xml projects/sysctl/ru_RU.KOI8-R/books/porters-handbook/versions.xml projects/sysctl/ru_RU.KOI8-R/htdocs/community/mailinglists.xml projects/sysctl/ru_RU.KOI8-R/htdocs/releases/index.xml projects/sysctl/ru_RU.KOI8-R/share/xml/l10n.ent projects/sysctl/share/examples/add-manref.sh projects/sysctl/share/misc/docbook.css projects/sysctl/share/mk/doc.xml.mk projects/sysctl/share/pgpkeys/adamw.key projects/sysctl/share/pgpkeys/bcr.key projects/sysctl/share/pgpkeys/bjk.key projects/sysctl/share/pgpkeys/bmah.key projects/sysctl/share/pgpkeys/dhw.key projects/sysctl/share/pgpkeys/gerald.key projects/sysctl/share/pgpkeys/kwm.key projects/sysctl/share/pgpkeys/lioux.key projects/sysctl/share/pgpkeys/marck.key projects/sysctl/share/pgpkeys/pgpkeys-developers.xml projects/sysctl/share/pgpkeys/pgpkeys.ent projects/sysctl/share/pgpkeys/philip.key projects/sysctl/share/pgpkeys/rene.key projects/sysctl/share/pgpkeys/swills.key projects/sysctl/share/pgpkeys/zeising.key projects/sysctl/share/pgpkeys/zi.key (contents, props changed) projects/sysctl/share/security/advisories/FreeBSD-SA-13:14.openssh.asc projects/sysctl/share/tools/webupdate (contents, props changed) projects/sysctl/share/tools/webupdate.wrapper projects/sysctl/share/xml/advisories.xml projects/sysctl/share/xml/authors.ent projects/sysctl/share/xml/bibliography.xml projects/sysctl/share/xml/commercial.consult.xml projects/sysctl/share/xml/commercial.isp.xml projects/sysctl/share/xml/events2013.xml projects/sysctl/share/xml/events2014.xml projects/sysctl/share/xml/freebsd-fo.xsl projects/sysctl/share/xml/freebsd-xhtml-common.xsl projects/sysctl/share/xml/header.ent projects/sysctl/share/xml/libcommon.xsl projects/sysctl/share/xml/man-refs.ent projects/sysctl/share/xml/mirrors.xml projects/sysctl/share/xml/navibar.ent projects/sysctl/share/xml/news.xml projects/sysctl/share/xml/notices.xml projects/sysctl/share/xml/press.xml projects/sysctl/share/xml/release.ent projects/sysctl/share/xml/statusreport.dtd projects/sysctl/zh_CN.UTF-8/share/xml/l10n.ent Directory Properties: projects/sysctl/ (props changed) projects/sysctl/bn_BD.ISO10646-1/ (props changed) projects/sysctl/de_DE.ISO8859-1/ (props changed) projects/sysctl/el_GR.ISO8859-7/ (props changed) projects/sysctl/en_US.ISO8859-1/ (props changed) projects/sysctl/es_ES.ISO8859-1/ (props changed) projects/sysctl/fr_FR.ISO8859-1/ (props changed) projects/sysctl/ja_JP.eucJP/ (props changed) projects/sysctl/ru_RU.KOI8-R/ (props changed) projects/sysctl/share/ (props changed) projects/sysctl/zh_CN.GB2312/ (props changed) Modified: projects/sysctl/bn_BD.UTF-8/articles/Makefile.inc ============================================================================== --- head/bn_BD.UTF-8/articles/Makefile.inc Thu Nov 14 00:20:51 2013 (r43188) +++ projects/sysctl/bn_BD.UTF-8/articles/Makefile.inc Wed Feb 26 04:10:49 2014 (r44070) @@ -2,4 +2,4 @@ # $FreeBSD$ # -DESTDIR?= ${DOCDIR}/bn_BD.ISO10646-1/articles/${.CURDIR:T} +DESTDIR?= ${DOCDIR}/bn_BD.UTF-8/articles/${.CURDIR:T} Modified: projects/sysctl/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml Wed Feb 26 03:50:57 2014 (r44069) +++ projects/sysctl/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml Wed Feb 26 04:10:49 2014 (r44070) @@ -4,45 +4,50 @@ The FreeBSD German Documentation Project $FreeBSD$ - $FreeBSDde: de-docproj/books/handbook/introduction/chapter.xml,v 1.67 2011/03/27 15:44:48 bcr Exp $ - basiert auf: 1.140 ---> - - Einführung - - JimMockNeu zusammengestellt, umstrukturiert und um - Abschnitte erweitert durch - + basiert auf: r43599 + --> + + + + + Einleitung + - SaschaEdelburgÜbersetzt von + + + Jim + Mock + + Restrukturiert, umorganisiert und Abschnitte neu + geschrieben von + - - - Übersicht + Überblick - Herzlichen Dank für Ihr Interesse an &os;! Das - folgende Kapitel behandelt verschiedene Aspekte des - &os; Projects wie dessen geschichtliche Entwicklung, - dessen Ziele oder dessen Entwicklungsmodell. + Herzlichen Dank für Ihr Interesse an &os;! Das folgende + Kapitel behandelt verschiedene Aspekte des &os; Projekts wie + dessen geschichtliche Entwicklung, seine Ziele oder das + Entwicklungsmodell. - Nach dem Durcharbeiten des Kapitels wissen Sie über + Nach dem Durcharbeiten des Kapitels wissen Sie über folgende Punkte Bescheid: Wo &os; im Vergleich zu anderen Betriebssystemen - steht - + steht - Die Geschichte des &os; Projects + Die Geschichte des &os; Projekts - Die Ziele des &os; Projects + Die Ziele des &os; Projekts @@ -51,1121 +56,1297 @@ - Und natürlich wo der Name &os; - herrührt + Und natürlich woher der Name &os; + kommt. - Willkommen bei &os;! + Willkommen zu &os; - - 4.4BSD-Lite - + 4.4BSD-Lite &os; ist ein auf 4.4BSD-Lite basierendes Betriebssystem - für Intel (x86 und &itanium;), AMD64 - und Sun &ultrasparc; Rechner. An - Portierungen zu anderen Architekturen wird derzeit gearbeitet. - Mehr zu Geschichte von &os; können Sie im kurzen geschichtlichen Abriss zu &os; - oder im Abschnitt Das aktuelle - &os;-Release nachlesen. - Falls Sie das &os; Project unterstützen wollen - (mit Quellcode, Hardware- oder Geldspenden), sollten Sie den - Artikel - &os; unterstützen lesen. + für Intel (x86 und &itanium;), AMD64 und Sun &ultrasparc; + Rechner. An Portierungen zu anderen Architekturen wird derzeit + gearbeitet. Mehr zur Geschichte von &os; erfahren Sie in die Geschichte von &os; oder aus den + aktuellen Release-Informationen. + Falls Sie das &os; Projekt unterstützen wollen (z.B. mit + Quellcode, Hardware- oder Geldspenden), lesen Sie den &os; + unterstützen Artikel. Was kann &os;? - &os; hat zahlreiche bemerkenswerte Eigenschaften. - Um nur einige zu nennen: + &os; hat zahlreiche bemerkenswerte Eigenschaften. Um nur + einige zu nennen: - - Präemptives Multitasking - - - Präemptives Multitasking mit - dynamischer Prioritätsanpassung zum reibungslosen und - ausgeglichenen Teilen der Systemressourcen zwischen - Anwendungen und Anwendern, selbst unter schwerster - Last. + Präemptives Multitasking + + Präemptives Multitasking + mit dynamischer Prioritätsanpassung zum + reibungslosen und ausgeglichenen Teilen der + Systemressourcen zwischen Anwendungen und Anwendern, + selbst unter schwerster Last. - - Mehrbenutzerbetrieb - - - Der Mehrbenutzerbetrieb von - &os; erlaubt es, viele Anwender gleichzeitig am System - mit verschiedenen Aufgaben arbeiten zu lassen. - Beispielsweise Geräte wie Drucker oder Bandlaufwerke, + Mehrbenutzerbetrieb + Mehrbenutzerbetrieb + erlaubt es, viele &os;-Anwender gleichzeitig am System mit + verschiedenen Aufgaben arbeiten zu lassen. Beispielsweise + können Geräte wie Drucker oder Bandlaufwerke, die sich nur schwerlich unter allen Anwendern des Systems - oder im Netzwerk teilen lassen, können durch Setzen - von Verwendungsbeschränkungen auf Benutzer oder - Benutzergruppen wichtige Systemressourcen vor - Überbeanspruchung schützen. + oder im Netzwerk teilen lassen, durch setzen von + Beschränkungen auf Benutzer oder Gruppen wichtige + Systemressourcen vor Überbeanspruchung geschützt + werden. - - TCP/IP-Netzwerkfähigkeit - - - Hervorragende - TCP/IP-Netzwerkfähigkeit mit - Unterstützung von Industriestandards wie SCTP, DHCP, - NFS, NIS, PPP, SLIP, IPsec und IPv6. Das heißt, - Ihr &os;-System kann in einfachster Weise mit anderen - Systemen interagieren. Zudem kann es als Server-System im - Unternehmen wichtige Aufgaben übernehmen, + StarkeTCP/IP-Netzwerkfähigkeit + TCP/IP-Netzwerkfähigkeit + mit Unterstützung von + Industriestandards wie SCTP, DHCP, NFS, NIS, PPP, + SLIP, IPsec und IPv6. Das bedeutet, Ihr &os;-System kann + in einfachster Weise mit anderen Systemen + interagieren. Zudem kann es als Server-System im + Unternehmen wichtige Aufgaben übernehmen, beispielsweise als NFS- oder E-Mail-Server oder es kann Ihren Betrieb durch HTTP- und FTP-Server beziehungsweise - durch Routing und Firewalling Internet-fähig machen. - - - - - Speicherschutz - - - Der Speicherschutz stellt sicher, - dass Anwendungen (oder Anwender) sich nicht gegenseitig - stören. Stürzt eine Anwendung ab, hat das - keine Auswirkung auf andere Prozesse. + durch Routing und Firewalling Internetfähig + machen. - &os; ist ein - 32-Bit-Betriebssystem - (64-Bit auf &itanium;, AMD64, - und &ultrasparc;) und wurde als solches von Grund auf - neu entworfen. + Speicherschutz + Speicherschutz stellt + sicher, dass Anwendungen (oder Anwender) sich + nicht gegenseitig stören. Stürzt eine Anwendung + ab, hat das keine Auswirkung auf andere Prozesse. - - X-Window-System - - - Das X-Window-System (X11R7) als - Industriestandard bietet eine grafische Benutzeroberfläche - (GUI). Minimale Voraussetzung zur Verwendung ist - lediglich eine Grafikkarte und ein Bildschirm, die beide - den VGA-Modus unterstützen. - + Der Industriestandard X-Window-System + X-Window-System + (X11R7) als Industriestandard bietet eine grafische + Benutzeroberfläche (GUI). Minimale Voraussetzung + zur Verwendung ist lediglich eine Grafikkarte und ein + Bildschirm, die beide den VGA-Modus + unterstützen. + - - Binärkompatibilität - Linux - - - - Binärkompatibilität - SCO - - - - Binärkompatibilität - SVR4 - - - - Binärkompatibilität - BSD/OS - - - - Binärkompatibilität - NetBSD - - - Binärkompatibilität mit - vielen unter verschiedenen Betriebssystemen erstellten + + + Binärkompatibilität + Linux + + + Binärkompatibilität + SCO + + + Binärkompatibilität + SVR4 + + + Binärkompatibilität + BSD/OS + + + Binärkompatibilität + NetBSD + + Binärkompatibilität mit + vielen auf anderen Betriebssystemen erstellten Programmen wie Linux, SCO, SVR4, BSDI und NetBSD. - Tausende von sofort - lauffähigen Anwendungen sind aus den - Ports- und - Packages-Sammlungen für &os; - verfügbar. Warum mühselig im Netz Software - suchen, wenn sie bereits hier vorhanden ist? - + Tausende zusätzliche leicht zu + portierende Anwendungen sind über die &os; + Ports und + Paket-Sammlung verfügbar. Warum + mühselig im Netz nach Software suchen, wenn diese + bereits vorhanden ist? - Tausende zusätzliche leicht zu - portierende Anwendungen sind über das + Tausende zusätzliche leicht zu + portierende Anwendungen sind über das Internet zu beziehen. &os; ist Quellcode-kompatibel mit den meisten kommerziellen &unix; Systemen. Daher - bedürfen Anwendungen häufig nur geringer oder + bedürfen Anwendungen häufig nur geringer oder gar keiner Anpassung, um auf einem &os;-System zu kompilieren. - + - - virtueller Speicher - - - Seitenweise anforderbarer Virtueller - Speicher und der merged VM/buffer - cache-Entwurf bedient effektiv den großen + Seitenweise anforderbarer virtueller + Speicher virtueller + Speicher + und merged VM/buffer cache + -Entwurf bedient effektiv den großen Speicherhunger mancher Anwendungen bei gleichzeitigem - Aufrechterhalten der Bedienbarkeit des Systems für + Aufrechterhalten der Bedienbarkeit des Systems für weitere Benutzer. - - Symmetrisches Multi-Processing (SMP) - - - SMP-Unterstützung für - Mehrprozessorsysteme + SMP + Symmetrisches Multi-Processing (SMP) + -Unterstützung für Systeme mit + mehreren CPUs. - - Kompiler - C - - - - Kompiler - C++ - - - - Kompiler - FORTRAN - - - Ein voller Satz von C, - C++ und Fortran- - Entwicklungswerkzeugen. Viele - zusätzliche Programmiersprachen für Wissenschaft - und Entwicklung sind aus der Ports- und Packages-Sammlung - zu haben. + + + Compiler + C + + + Compiler + C++ + + Ein voller Satz von C und + C++ Entwicklungswerkzeugen. Viele + zusätzliche Programmiersprachen für höhere + Wissenschaft und Entwicklung sind in der Ports- und + Packages-Sammlung verfügbar. - - Quellcode - - - Quellcode für das gesamte - System bedeutet größtmögliche Kontrolle - über Ihre Umgebung. Warum sollte man sich durch - proprietäre Lösungen knebeln und sich auf Gedeih - und Verderb der Gnade eines Herstellers ausliefern, wenn - man doch ein wahrhaft offenes System haben kann? + Quellcode + Quellcode + für das gesamte System bedeutet + größtmögliche Kontrolle über Ihre + Umgebung. Warum sollte man sich durch proprietäre + Lösungen knebeln und sich auf Gedeih und Verderb der + Gnade eines Herstellers ausliefern, wenn man doch ein + wahrhaft offenes System haben kann? Umfangreiche Online-Dokumentation. - - - 4.4BSD-Lite - - - - Computer Systems Research Group (CSRG) - - - - U.C. Berkeley - + + und viele weitere! + + - &os; basiert auf dem 4.4BSD-Lite-Release der Computer - Systems Research Group (CSRG) der Universität von - Kalifornien in Berkeley und führt die namhafte - Tradition der Entwicklung von BSD-Systemen fort. - Zusätzlich zu der herausragenden Arbeit der CSRG hat das - &os; Project tausende weitere Arbeitsstunden investiert, - um das System zu verfeinern und maximale Leistung und - Zuverlässigkeit bei Alltagslast zu bieten. Während - viele kommerzielle Riesen Probleme haben PC-Betriebssysteme - mit derartigen Funktionen, Leistungpotential und - Zuverlässigkeit anzubieten, kann &os; damit schon - jetzt aufwarten! + &os; basiert auf dem 4.4BSD-Lite- + 4.4BSD-Lite + Release der Computer Systems Research Group + (CSRG) Computer Systems Research Group + (CSRG) + der Universität von Kalifornien in + Berkeley und führt die namhafte Tradition der + Entwicklung von BSD-Systemen fort. Zusätzlich zu der + herausragenden Arbeit der CSRG hat das &os; Projekt tausende + weitere Arbeitsstunden investiert, um das System zu + verfeinern und maximale Leistung und Zuverlässigkeit + bei Alltagslast zu bieten. Während viele + kommerzielle Riesen Probleme damit haben, PC-Betriebssysteme + mit derartigen Funktionen, Leistungspotential und + Zuverlässigkeit anzubieten, kann &os; damit schon jetzt + aufwarten! - Die Anwendungsmöglichkeiten von &os; werden nur + Die Anwendungsmöglichkeiten von &os; werden nur durch Ihre Vorstellungskraft begrenzt. Von Software-Entwicklung bis zu Produktionsautomatisierung, von - Lagerverwaltung über Abweichungskorrektur bei Satelliten; - Falls etwas mit kommerziellen &unix; Produkten machbar ist, dann - ist es höchstwahrscheinlich auch mit &os; - möglich. &os; profitiert stark von tausenden + Lagerverwaltung über Abweichungskorrektur bei Satelliten; + Falls etwas mit kommerziellen &unix; Produkten machbar ist, + dann ist es höchstwahrscheinlich auch mit &os; + möglich. &os; profitiert stark von tausenden hochwertigen Anwendungen aus wissenschaftlichen Instituten und - Universitäten in aller Welt. Häufig sind diese - für wenig Geld oder sogar kostenlos zu bekommen. - Kommerzielle Anwendungen sind ebenso verfügbar und es - werden täglich mehr. + Universitäten in aller Welt. Häufig sind diese + für wenig Geld oder sogar kostenlos zu bekommen. + Kommerzielle Anwendungen sind ebenso verfügbar und es + werden täglich mehr. Durch den freien Zugang zum Quellcode von &os; ist es - in unvergleichbarer Weise möglich, das System für + in unvergleichbarer Weise möglich, das System für spezielle Anwendungen oder Projekte anzupassen. Dies ist mit den meisten kommerziellen Betriebssystemen einfach nicht - möglich. Beispiele für Anwendungen, die unter + möglich. Beispiele für Anwendungen, die unter &os; laufen, sind: - Internet-Dienste: Die robuste + Internet-Dienste: Die robuste TCP/IP-Implementierung in &os; macht es zu einer - idealen Plattform für verschiedenste + idealen Plattform für verschiedenste Internet-Dienste, wie zum Beispiel: - - FTP-Server - - - FTP-Server - - - - - HTTP-Server - - - HTTP-Server (Standard-Web-Server oder mit - SSL-Verschlüsselung) + HTTP-Server + Webserver (Standard + oder mit SSL-Verschlüsselung) IPv4- und IPv6-Routing - + - + Firewall Firewall - - - - NAT - - - Firewalls und NAT-Gateways - (IP-Masquerading) + + NAT NAT + + (IP-Masquerading)-Gateways - - E-Mail - - - E-Mail-Server + FTP-Server + FTP-Server + - - Usenet - + + + E-Mail + E-Mail + + + E-Mail + + E-Mail-Server + - Usenet-News und Foren (BBS) + + Und mehr... - - Zum Betreiben von &os; reicht schon ein - günstiger 386-PC. Wenn es das Wachstum Ihres - Unternehmens verlangt, kann &os; aber auch auf einem - hochgerüsteten 4-Wege-System mit Xeon-Prozessoren - und RAID-Plattenspeicher Verwendung finden. - Bildung: Sind Sie + Bildung: Sind Sie Informatikstudent oder Student eines verwandten - Studiengangs? Die praktischen Einblicke in &os; sind - die beste Möglichkeit etwas über Betriebssysteme, + Studiengangs? Die praktischen Einblicke in &os; sind die + beste Möglichkeit etwas über Betriebssysteme, Rechnerarchitektur und Netzwerke zu lernen. Einige frei - erhältliche CAD-, mathematische und grafische Anwendungen - sind sehr nützlich, gerade für diejenigen, die - &os; nicht zum Selbstzweck, sondern als - Arbeitsmittel einsetzen. + erhältliche CAD-, mathematische und grafische + Anwendungen sind sehr nützlich, gerade für + diejenigen, deren Hauptinteresse in einem Computer darin + besteht, andere Arbeit zu + erledigen! - Wissenschaft: Mit dem frei - verfügbaren Quellcode für das gesamte System + Forschung: Mit dem frei + verfügbaren Quellcode für das gesamte System bildet &os; ein exzellentes Studienobjekt in der Disziplin der Betriebssysteme, wie auch in anderen Zweigen der Informatik. Es ist beispielsweise denkbar, das - räumlich getrennte Gruppen gemeinsam an einer Idee + räumlich getrennte Gruppen gemeinsam an einer Idee oder Entwicklung arbeiten. Das Konzept der freien - Verfügbarkeit und -nutzung von &os; - ermöglicht so einen Gebrauch, auch ohne sich - groß Gedanken über Lizenzbedingungen oder - -beschränkungen machen zu müssen. - - - - - Router - - - - DNS-Server - - - Netzwerkfähigkeit: Brauchen - Sie einen neuen Router? Oder einen Name-Server (DNS)? Eine - Firewall zum Schutze Ihres Intranets vor Fremdzugriff? - &os; macht aus dem in der Ecke verstaubenden 386- oder - 486-PC im Handumdrehen einen leistungsfähigen Router - mit anspruchsvollen Packet-Filter-Fähigkeiten. - - - - - X-Window-System - Accelerated-X - - - X-Window-Workstation: &os; ist - eine gute Wahl für kostengünstige X-Terminals - mit dem frei verfügbaren X11-Server. - Im Gegensatz zu einem X-Terminal erlaubt es &os;, viele - Anwendungen lokal laufen zu lassen, was die Last eines - zentralen Servers erleichtern kann. &os; kann selbst - plattenlos starten, was einzelne - Workstations noch günstiger macht und die Wartung - erleichtert. - - - - - GNU-Compiler-Collection - - - Software-Entwicklung: Das - Standard-System von &os; wird mit einem kompletten Satz - an Entwicklungswerkzeugen bereitgestellt, unter anderem - mit dem bekannten GNU C/C++-Kompiler und -Debugger. + Verfügbarkeit und -nutzung von &os; + ermöglicht so die freie Verwendung, ohne sich + groß Gedanken über Lizenzbedingungen zu machen + oder aufgrund von Beschränkungen evtl. in einem + offenen Forum bestimmte Dinge nicht diskutieren zu + dürfen. + + + + Netzwerkfähigkeit: Brauchen + Sie einen neuen Router? + Router + Oder einen Name-Server (DNS)? + DNS-Server + + Eine Firewall zum Schutze Ihres Intranets vor + Fremdzugriff? &os; macht aus dem in der Ecke verstaubenden + 386- oder 486-PC im Handumdrehen einen + leistungsfähigen Router mit anspruchsvollen + Paketfilter-Funktionen. + + + + Embedded: &os; ist eine + exzellente Plattform, um auf embedded Systemen + aufzubauen. embedded + Mit der Unterstützung für die + &arm;-, &mips;- und &powerpc;-Plattformen, verbunden mit + dem robusten Netzwerkstack, aktuellen Neuerungen und der + freizügigen BSD-Lizenz + stellt &os; eine ausgezeichnete Basis für embedded + Router, Firewalls und andere Geräte dar. + + + + + + X-Window-System + + + GNOME + + + KDE + + Desktop: &os; ist eine gute Wahl + für kostengünstige X-Terminals mit dem frei + verfügbaren X11-Server. &os; bietet die Auswahl aus + vielen Open Source Desktop Umgebungen, dazu gehören + auch die GNOME und + KDE GUIs. &os; kann sogar + plattenlos booten, was einzelne + Workstations sogar noch günstiger macht und die + Verwaltung erleichtert. + + + + Software-Entwicklung: Das + Standard-&os;-System wird mit einem kompletten Satz an + Entwicklungswerkzeugen bereitgestellt, unter anderem einem + vollständigen C/C++-Compiler und + -Debugger. Compiler + Entwicklungswerkzeugen. Viele + zusätzliche Programmiersprachen für Wissenschaft + und Entwicklung sind aus der Ports- und Packages-Sammlung + zu haben. &os; ist sowohl in Form von Quellcode als auch in - Binärform auf CD-ROM, DVD und über anonymous FTP - erhältlich. Näheres zum Bezug von &os; - enthält . - + Binärform auf CD-ROM, DVD und über Anonymus FTP + erhältlich. Lesen Sie dazu , + um weitere Informationen zum Bezug von &os; zu + erhalten. - Wer benutzt &os;? + Wer verwendet &os;? Anwender - Bekannte &os;-Anwender + Grosse, bekannte &os;-Anwender - &os; dient als Plattform für Geräte und Produkte - einiger der weltgrößten IT-Firmen, darunter: + &os;s fortgeschrittene Eigenschaften, bewährte + Sicherheit und vorhersehbare Release-Zyklen, genauso wie seine + tolerante Lizenz haben dazu geführt, dass es als + Plattform zum Aufbau vieler kommerzieller und quelloffener + Geräte und Produkte verwendet wird, dazu gehören ein + paar der weltgrössten IT-Unternehmen: - AppleApple - - - CiscoCisco + Apache + + Apache + - Die Apache Software Foundation lässt + den Grossteil seiner der Öffentlichkeit + zugänglichen Infrastruktur, inklusive des + möglicherweise grössten SVN-Repositories der + Welt mit über 1,4 Millionen Commits, auf &os; + laufen. + + + + Apple + + Apple + - OS X verwendet viel von &os;s eigenem + Netzwerkstack, virtuellem Dateisystem und den + Benutzerumgebungskomponenten für sein eigenes System. + Apple iOS nutzt ebenso Elemente, die es von &os; + übernommen hat. + + + Cisco + + Cisco + - IronPort Network Sicherheits- und + Anti-Spam-Appliance verwendet einen modifizierten + &os;-Kernel. + + + Citrix + + Citrix + - Die NetScaler Reihe von + Sicherheits-Appliances bietet auf den Schichten 4-7 + Load-Balancing, Content Caching, Anwendungsfirewall, + gesichertes VPN und mobilen Cloud-Netzwerkzugriff, gepaart + mit der Mächtigkeit der &os;-Shell. + + + + Dell + KACE Dell KACE + - Die KACE Systemmanagement-Appliances nutzen + &os; wegen seiner Zuverlässigkeit, Skalierbarkeit und + Gemeinschaft, welche deren zukünftige + Weiterentwicklung fördert. + + + + Experts + Exchange + + Experts Exchange + - Alle öffentlich zugänglichen + Webserver werden von &os; betrieben und machen starken + Gebrauch von Jails, ohne den Überhang von + Virtualisierung, um Entwicklungs- und Testumgebung + voneinander zu isolieren. + + + + Isilon + + Isilon - Isilons + Unternehmens-Speicherappliances basieren auf &os;. Die + extrem liberale &os;-Lizenz erlaubt Isilon ihr + intellektuelles Eigentum durch den gesamten Kernel zu + integrieren und kann sich so auf das Erstellen ihres + Produktes und nicht des Betriebssystems + fokussieren. + + + + iXsystems + iXsystems + - Die TrueNAS-Linie von vereinheitlichten + Speicherappliances beruht auf &os;. Zusätzlich zu + deren kommerziellen Produkten, managed iXsystems auch noch + die beiden Open Source Projekte PC-BSD und FreeNAS. + + + + Juniper + + Juniper - Das JunOS + Betriebssystem, welches alle Juniper Netzwerkgeräte + (inklusive Router, Switche, Sicherheits- und + Netzwerkappliances) antreibt, verwendet &os; Juniper ist + einer der vielen Hersteller, welcher das symbolische + Verhältnis zwischen dem Projekt und dem Hersteller + von kommerziellen Produkten darstellt. Verbesserungen, die + Juniper entwickelt hat, werden ebenso in &os; aufgenommen, + um die Komplexität der Integration neuer + Eigenschaften von &os; zurück in zukünftige + JunOS Versionen zu vereinfachen. + + + + McAfee + + McAfee + - SecurOS, die Basis von McAfee + Enterprise-Firewallprodukten inkl. Sidewinder basiert auf + &os;. + + + + NetApp + + NetApp + - Die Data ONTAP GX Reihe von + Speicherappliances basieren auf &os;. Zusätzlich hat + NetApp viele Neuheiten beigesteuert, inklusive des neuen + BSD-lizensierten Hypervisors bhyve. + + + + Netflix + + Netflix + - Die OpenConnect-Appliance, die Netflix + verwendet, um Filme zu seinen Kunden zu streamen basiert + auf &os;. Netflix hat weitreichende Beiträge zum + Quellcode von &os; beigetragen und arbeitet daran, ein + möglichst geringes Delta zur normalen Version + beizubehalten. Netflix OpenConnect-Appliances sind + für mehr als 32% vom gesamten Internetverkehr in + Nordamerika verantwortlich. + + + + Sandvine + + Sandvine + - Sandvine nutzt &os; as die Basis für + deren Echtzeit Hochgeschwindigkeits-Netzwerkplattform, + welche den Kern deren intelligenter + Netzwerkpolicy-Kontrollprodukte darstellt. + + + + Sony + + Sony + - Sowohl die PlayStation 3 und PlayStation 4 + Spielekonsolen verwenden modifizierte Versionen von + &os;. + + + + Sophos + + Sophos + - Das Sophos Email-Appliance Produkt basiert + auf einem abgesicherten &os; und scannt eingehende E-Mail + auf Spam und Viren, während es gleichzeitig + ausgehende Mail auf Schadsoftware und versehentlichen + Versand von vertraulichen Informationen + überwacht. + + + + Spectra + Logic Spectra + Logic - Die nTier Reihe von + archivspeicherfähigen Appliances nutzt &os; und + OpenZFS. + + + + The Weather + Channel + The Weather Channel + + - Die IntelliStar Appliance, welche am + Kopfende eines jeden Kabelversorgers installiert ist und + für das Einspeisen von lokalen Wettervorhersagen in + das Kabelfernsehprogramm verantwortlich ist, läuft + auf &os;. + + + + Verisign + + Verisign + + - Verisign ist für den Betrieb der .com + und .net Root-Domainregistries genauso verantwortlich wie + für die dazugehörige DNS-Infrastruktur. Sie + verlassen sich auf einen Reihe von verschiedenen + Netzwerkbetriebssystemen inklusive &os;, um zu + gewährleisten, dass es keine gemeinsame Fehlerstelle + in deren Infrastruktur gibt. + + + + WhatsApp + + WhatsApp + - Als WhatsApp eine Plattform benötigte, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Feb 26 23:49:38 2014 Return-Path: Delivered-To: svn-doc-projects@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 5C0DAE3F; Wed, 26 Feb 2014 23:49:38 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 39FA71A6E; Wed, 26 Feb 2014 23:49:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QNncfV072676; Wed, 26 Feb 2014 23:49:38 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QNncLC072675; Wed, 26 Feb 2014 23:49:38 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402262349.s1QNncLC072675@svn.freebsd.org> From: Warren Block Date: Wed, 26 Feb 2014 23:49:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44084 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 23:49:38 -0000 Author: wblock Date: Wed Feb 26 23:49:37 2014 New Revision: 44084 URL: http://svnweb.freebsd.org/changeset/doc/44084 Log: ZFS tuning content addtions by Allan Jude . Submitted by: Allan Jude Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Wed Feb 26 23:44:33 2014 (r44083) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Wed Feb 26 23:49:37 2014 (r44084) @@ -675,7 +675,11 @@ errors: No known data errors ideally at least once every three months. The scrub operating is very disk-intensive and will reduce performance while running. Avoid high-demand - periods when scheduling scrub. + periods when scheduling scrub or use vfs.zfs.scrub_delay + to adjust the relative priority of the + scrub to prevent it interfering with other + workloads. &prompt.root; zpool scrub mypool &prompt.root; zpool status @@ -890,7 +894,8 @@ errors: No known data errors After the scrub operation has completed and all the data has been synchronized from ada0 to - ada1, the error messages can be cleared + ada1, the error messages can be cleared from the pool status by running zpool clear. @@ -2014,7 +2019,258 @@ mypool/compressed_dataset logicalused <acronym>ZFS</acronym> Tuning - + There are a number of tunables that can be adjusted to + make ZFS perform best for different + workloads. + + + + + vfs.zfs.arc_max - + Sets the maximum size of the ARC. + The default is all RAM less 1 GB, + or 1/2 of ram, whichever is more. However a lower value + should be used if the system will be running any other + daemons or processes that may require memory. This value + can only be adjusted at boot time, and is set in + /boot/loader.conf. + + + + + vfs.zfs.arc_meta_limit + - Limits the portion of the ARC + that can be used to store metadata. The default is 1/4 of + vfs.zfs.arc_max. Increasing this value + will improve performance if the workload involves + operations on a large number of files and directories, or + frequent metadata operations, at the cost of less file + data fitting in the ARC. + This value can only be adjusted at boot time, and is set + in /boot/loader.conf. + + + + + vfs.zfs.arc_min - + Sets the minimum size of the ARC. + The default is 1/2 of + vfs.zfs.arc_meta_limit. Adjust this + value to prevent other applications from pressuring out + the entire ARC. + This value can only be adjusted at boot time, and is set + in /boot/loader.conf. + + + + + vfs.zfs.vdev.cache.size + - A preallocated amount of memory reserved as a cache for + each device in the pool. The total amount of memory used + will be this value multiplied by the number of devices. + This value can only be adjusted at boot time, and is set + in /boot/loader.conf. + + + + + vfs.zfs.prefetch_disable + - Toggles prefetch, a value of 0 is enabled and 1 is + disabled. The default is 0, unless the system has less + than 4 GB of RAM. Prefetch works + by reading larged blocks than were requested into the + ARC + in hopes that the data will be needed soon. If the + workload has a large number of random reads, disabling + prefetch may actually improve performance by reducing + unnecessary reads. This value can be adjusted at any time + with &man.sysctl.8;. + + + + + vfs.zfs.vdev.trim_on_init + - Controls whether new devices added to the pool have the + TRIM command run on them. This ensures + the best performance and longevity for + SSDs, but takes extra time. If the + device has already been secure erased, disabling this + setting will make the addition of the new device faster. + This value can be adjusted at any time with + &man.sysctl.8;. + + + + + vfs.zfs.write_to_degraded + - Controls whether new data is written to a vdev that is + in the DEGRADED + state. Defaults to 0, preventing writes to any top level + vdev that is in a degraded state. The administrator may + with to allow writing to degraded vdevs to prevent the + amount of free space across the vdevs from becoming + unbalanced, which will reduce read and write performance. + This value can be adjusted at any time with + &man.sysctl.8;. + + + + + vfs.zfs.vdev.max_pending + - Limits the number of pending I/O requests per device. + A higher value will keep the device command queue full + and may give higher throughput. A lower value will reduce + latency. This value can be adjusted at any time with + &man.sysctl.8;. + + + + + vfs.zfs.top_maxinflight + - The maxmimum number of outstanding I/Os per top-level + vdev. Limits the + depth of the command queue to prevent high latency. The + limit is per top-level vdev, meaning the limit applies to + each mirror, + RAID-Z, or + other vdev independantly. This value can be adjusted at + any time with &man.sysctl.8;. + + + + + vfs.zfs.l2arc_write_max + - Limits the amount of data written to the L2ARC + per second. This tunable is designed to extend the + longevity of SSDs by limiting the + amount of data written to the device. This value can be + adjusted at any time with &man.sysctl.8;. + + + + + vfs.zfs.l2arc_write_boost + - The value of this tunable is added to vfs.zfs.l2arc_write_max + and increases the write speed to the + SSD until the first block is evicted + from the L2ARC. + This "Turbo Warmup Phase" is designed to reduce the + performance loss from an empty L2ARC + after a reboot. This value can be adjusted at any time + with &man.sysctl.8;. + + + + + vfs.zfs.no_scrub_io + - Disable scrub + I/O. Causes scrub to not actually read + the data blocks and verify their checksums, effectively + turning any scrub in progress into a + no-op. This may be useful if a scrub + is interferring with other operations on the pool. This + value can be adjusted at any time with + &man.sysctl.8;. + + If this tunable is set to cancel an + in-progress scrub, be sure to unset + it afterwards or else all future + scrub and resilver operations + will be ineffective. + + + + + vfs.zfs.scrub_delay + - Determines the milliseconds of delay inserted between + each I/O during a scrub. + To ensure that a scrub does not + interfere with the normal operation of the pool, if any + other I/O is happening the scrub will + delay between each command. This value allows you to + limit the total IOPS (I/Os Per Second) + generated by the scrub. The default + value is 4, resulting in a limit of: 1000  ms / 4 = + 250 IOPS. Using a value of + 20 would give a limit of: + 1000 ms / 20 = 50 IOPS. The + speed of scrub is only limited when + there has been only recent activity on the pool, as + determined by vfs.zfs.scan_idle. + This value can be adjusted at any time with + &man.sysctl.8;. + + + + + vfs.zfs.resilver_delay + - Determines the milliseconds of delay inserted between + each I/O during a resilver. To ensure + that a resilver does not interfere with + the normal operation of the pool, if any other I/O is + happening the resilver will delay + between each command. This value allows you to limit the + total IOPS (I/Os Per Second) generated + by the resilver. The default value is + 2, resulting in a limit of: 1000  ms / 2 = + 500 IOPS. Returning the pool to + an Online state may + be more important if another device failing could Fault the pool, causing + data loss. A value of 0 will give the + resilver operation the same priority as + other operations, speeding the healing process. The speed + of resilver is only limited when there + has been other recent activity on the pool, as determined + by vfs.zfs.scan_idle. + This value can be adjusted at any time with + &man.sysctl.8;. + + + + + vfs.zfs.scan_idle + - How many milliseconds since the last operation before + the pool is considered idle. When the pool is idle the + rate limiting for scrub + and resilver are disabled. + This value can be adjusted at any time with + &man.sysctl.8;. + + + + + vfs.zfs.txg.timeout + - Maximum seconds between transaction groups. The + current transaction group will be written to the pool and + a fresh transaction group started if this amount of time + has elapsed since the previous transaction group. A + transaction group my be triggered earlier if enough data + is written. The default value is 5 seconds. A larger + value may improve read performance by delaying + asynchronous writes, but this may cause uneven performance + when the transaction group is written. This value can be + adjusted at any time with &man.sysctl.8;. + + @@ -2356,6 +2612,76 @@ vfs.zfs.vdev.cache.size="5M" + Transaction Group + (TXG) + + Transaction Groups are the way changed blocks are + grouped together and eventually written to the pool. + Transaction groups are the atomic unit that + ZFS uses to assert consistency. Each + transaction group is assigned a unique 64-bit + consecutive identifier. There can be up to three active + transaction groups at a time, one in each of these three + states: + + + + Open - When a new + transaction group is created, it is in the open + state, and accepts new writes. There is always + a transaction group in the open state, however the + transaction group may refuse new writes if it has + reached a limit. Once the open transaction group + has reached a limit, or the vfs.zfs.txg.timeout + has been reached, the transaction group advances + to the next state. + + + + Quiescing - A short state + that allows any pending operations to finish while + not blocking the creation of a new open + transaction group. Once all of the transactions + in the group have completed, the transaction group + advances to the final state. + + + + Syncing - All of the data + in the transaction group is written to stable + storage. This process will in turn modify other + data, such as metadata and space maps, that will + also need to be written to stable storage. The + process of syncing involves multiple passes. The + first, all of the changed data blocks, is the + biggest, followed by the metadata, which may take + multiple passes to complete. Since allocating + space for the data blocks generates new metadata, + the syncing state cannot finish until a pass + completes that does not allocate any additional + space. The syncing state is also where + synctasks are completed. + Synctasks are administrative + operations, such as creating or destroying + snapshots and datasets, that modify the uberblock + are completed. Once the sync state is complete, + the transaction group in the quiescing state is + advanced to the syncing state. + + + + All administrative functions, such as snapshot + are written as part of the transaction group. When a + synctask is created, it is added to + the currently open transaction group, and that group is + advances as quickly as possible to the syncing state in + order to reduce the latency of administrative + commands. + + + Adaptive Replacement Cache (ARC) @@ -2419,12 +2745,13 @@ vfs.zfs.vdev.cache.size="5M"L2ARC is limited to the sum of the write limit and the boost limit, then after that limited to the write limit. A - pair of sysctl values control these rate limits; - vfs.zfs.l2arc_write_max controls how - many bytes are written to the cache per second, while - vfs.zfs.l2arc_write_boost adds to - this limit during the "Turbo Warmup Phase" (Write - Boost). + pair of sysctl values control these rate limits; vfs.zfs.l2arc_write_max + controls how many bytes are written to the cache per + second, while vfs.zfs.l2arc_write_boost + adds to this limit during the "Turbo Warmup Phase" + (Write Boost). @@ -2682,7 +3009,7 @@ vfs.zfs.vdev.cache.size="5M" @@ -2746,7 +3073,12 @@ vfs.zfs.vdev.cache.size="5M"scrub makes sure even infrequently used blocks are checked for silent corruption. This improves the security of the data, - especially in archival storage situations. + especially in archival storage situations. The relative + priority of scrub can be adjusted + with vfs.zfs.scrub_delay + to prevent the scrub from degrading the performance of + other workloads on your pool. From owner-svn-doc-projects@FreeBSD.ORG Thu Feb 27 01:33:39 2014 Return-Path: Delivered-To: svn-doc-projects@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 ECCD9694; Thu, 27 Feb 2014 01:33:38 +0000 (UTC) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8EB05144B; Thu, 27 Feb 2014 01:33:31 +0000 (UTC) Received: from alph.d.allbsd.org (p2106-ipbf2009funabasi.chiba.ocn.ne.jp [114.146.169.106]) (authenticated bits=128) by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id s1R1X9hC000621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 27 Feb 2014 10:33:20 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.d.allbsd.org (8.14.7/8.14.7) with ESMTP id s1R1X7xb084265; Thu, 27 Feb 2014 10:33:09 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Thu, 27 Feb 2014 10:25:18 +0900 (JST) Message-Id: <20140227.102518.1055418444147943752.hrs@allbsd.org> To: wblock@FreeBSD.org Subject: Re: svn commit: r44084 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs From: Hiroki Sato In-Reply-To: <201402262349.s1QNncLC072675@svn.freebsd.org> References: <201402262349.s1QNncLC072675@svn.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Thu_Feb_27_10_25_18_2014_041)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.2.7 (mail.allbsd.org [133.31.130.32]); Thu, 27 Feb 2014 10:33:20 +0900 (JST) X-Spam-Status: No, score=-94.3 required=13.0 tests=CONTENT_TYPE_PRESENT, RCVD_IN_PBL,RCVD_IN_RP_RNBL,SPF_SOFTFAIL,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: svn-doc-projects@FreeBSD.org, doc-committers@FreeBSD.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 01:33:39 -0000 ----Security_Multipart(Thu_Feb_27_10_25_18_2014_041)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Warren Block wrote in <201402262349.s1QNncLC072675@svn.freebsd.org>: wb> Author: wblock wb> Date: Wed Feb 26 23:49:37 2014 wb> New Revision: 44084 wb> URL: http://svnweb.freebsd.org/changeset/doc/44084 wb> wb> Log: wb> ZFS tuning content addtions by Allan Jude . wb> wb> Submitted by: Allan Jude wb> wb> Modified: wb> projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ... wb> + wb> + wb> + vfs.zfs.arc_max - wb> + Sets the maximum size of the + linkend="zfs-term-arc">ARC. wb> + The default is all RAM less 1 GB, wb> + or 1/2 of ram, whichever is more. However a lower value wb> + should be used if the system will be running any other wb> + daemons or processes that may require memory. This value wb> + can only be adjusted at boot time, and is set in wb> + /boot/loader.conf. wb> + I think is better for this list. vfs.zfs.arc_max Sets the .... ... -- Hiroki ----Security_Multipart(Thu_Feb_27_10_25_18_2014_041)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlMOk/4ACgkQTyzT2CeTzy30PQCfWaw2fmWf3iaO1uB/prVZCeg9 4BoAniFB98E9pNx1xrsyF4up57tYNITi =zZXy -----END PGP SIGNATURE----- ----Security_Multipart(Thu_Feb_27_10_25_18_2014_041)---- From owner-svn-doc-projects@FreeBSD.ORG Thu Mar 20 19:37:47 2014 Return-Path: Delivered-To: svn-doc-projects@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 D8E9CC7C; Thu, 20 Mar 2014 19:37:47 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 97042845; Thu, 20 Mar 2014 19:37:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2KJblXe088126; Thu, 20 Mar 2014 19:37:47 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2KJblX9088125; Thu, 20 Mar 2014 19:37:47 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201403201937.s2KJblX9088125@svn.freebsd.org> From: Glen Barber Date: Thu, 20 Mar 2014 19:37:47 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44304 - projects/relnotes-restructure X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Mar 2014 19:37:47 -0000 Author: gjb Date: Thu Mar 20 19:37:47 2014 New Revision: 44304 URL: http://svnweb.freebsd.org/changeset/doc/44304 Log: Remove project branch that will not be merged. Sponsored by: The FreeBSD Foundation Deleted: projects/relnotes-restructure/ From owner-svn-doc-projects@FreeBSD.ORG Thu Apr 17 20:07:00 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F233FF5C; Thu, 17 Apr 2014 20:06:59 +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 DDAF41C9A; Thu, 17 Apr 2014 20:06:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3HK6xNG023671; Thu, 17 Apr 2014 20:06:59 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3HK6x1N023670; Thu, 17 Apr 2014 20:06:59 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201404172006.s3HK6x1N023670@svn.freebsd.org> From: Benedict Reuschling Date: Thu, 17 Apr 2014 20:06:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44599 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2014 20:07:00 -0000 Author: bcr Date: Thu Apr 17 20:06:59 2014 New Revision: 44599 URL: http://svnweb.freebsd.org/changeset/doc/44599 Log: Update and expand the sections on ZFS snapshots and clones. It describes: - what they are, what they can do and how they can be helpful, - how to create them - how to compare snapshots using zfs diff - how to do rollbacks - the .zfs directory and how to control its visibility using the ZFS property - promoting clones to real datasets and what the origin property shows A bunch of examples are also added to follow along with the descriptions. Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Thu Apr 17 18:24:40 2014 (r44598) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Thu Apr 17 20:06:59 2014 (r44599) @@ -1246,19 +1246,18 @@ Filesystem Size Used Avail Cap Renaming a Dataset - The name of a dataset can be changed with - zfs rename. rename can - also be used to change the parent of a dataset. Renaming a - dataset to be under a different parent dataset will change the - value of those properties that are inherited by the child - dataset. When a dataset is renamed, it is unmounted and then - remounted in the new location (inherited from the parent - dataset). This behavior can be prevented with - . Due to the nature of snapshots, they - cannot be renamed outside of the parent dataset. To rename a - recursive snapshot, specify , and all - snapshots with the same specified snapshot will be - renamed. + The name of a dataset can be changed with zfs + rename. rename can also be + used to change the parent of a dataset. Renaming a dataset to + be under a different parent dataset will change the value of + those properties that are inherited by the child dataset. + When a dataset is renamed, it is unmounted and then remounted + in the new location (inherited from the parent dataset). This + behavior can be prevented with . Due to + the nature of snapshots, they cannot be renamed outside of the + parent dataset. To rename a recursive snapshot, specify + , and all snapshots with the same specified + snapshot will be renamed. @@ -1309,36 +1308,350 @@ tank custom:costcenter - Snapshots are one of the most powerful features of ZFS. A - snapshot provides a point-in-time copy of the dataset. The - parent dataset can be easily rolled back to that snapshot - state. Create a snapshot with zfs snapshot - dataset@snapshotname. - Adding creates a snapshot recursively, - with the same name on all child datasets. - - Snapshots are mounted in a hidden directory - under the parent dataset: .zfs/snapshots/snapshotname. - Individual files can easily be restored to a previous state by - copying them from the snapshot back to the parent dataset. It - is also possible to revert the entire dataset back to the - point-in-time of the snapshot using - zfs rollback. - - Snapshots consume space based on how much the parent file - system has changed since the time of the snapshot. The - written property of a snapshot tracks how - much space is being used by the snapshot. - - Snapshots are destroyed and the space reclaimed with - zfs destroy - dataset@snapshot. - Adding recursively removes all - snapshots with the same name under the parent dataset. Adding - to the command - displays a list of the snapshots that would be deleted and - an estimate of how much space would be reclaimed without - performing the actual destroy operation. + snapshot provides a read-only, point-in-time copy of the + dataset. Due to ZFS' Copy-On-Write (COW) implementation, + snapshots can be created quickly simply by preserving the + older version of the data on disk. When no snapshot is + created, ZFS simply reclaims the space for future use. + Snapshots preserve disk space by recording only the + differences that happened between snapshots. ZFS llow + snapshots only on whole datasets, not on individual files or + directories. When a snapshot is created from a dataset, + everything contained in it, including the filesystem + properties, files, directories, permissions, etc. are + duplicated. + + Snapshots provide a variety of uses that other filesystems + with snapshot functionality do not have. A typical example + for snapshots is to have a quick way of backing up the current + state of the filesystem when a risky action like a software + installation or a system upgrade is performed. When the + action fails, the snapshot can be rolled back and the system + has the same state as when the snapshot was created. If the + upgrade was successful, the snapshot can be deleted to free up + space. Without snapshots and a failed upgrade a restore from + backup is often required, which is tedious, time consuming and + may require a downtime in which the system cannot be used as + normal. Snapshots can be rolled back quickly and can be done + when the system is running in normal operation, with little or + no downtime. The time savings are enormous considering + multi-terabyte storage systems and the time required to copy + the data from backup. Snapshots are not a replacement for a + complete backup of a pool, but can be used as a quick and easy + way to store a copy of the dataset at a specific point in + time. + + + Creating Snapshots + + Create a snapshot with zfs snapshot + dataset@snapshotname. + Adding creates a snapshot recursively, + with the same name on all child datasets. The following + example creates a snapshot of a home directory: + + &prompt.root; zfs snapshot + bigpool/work/joe@backup +&prompt.root; zfs list -t snapshot +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe@backup 0 - 85.5K - + + Snapshots are not listed by a normal zfs + list operation. In order to list the snapshot + that was just created, the option -t + snapshot has to be appended to zfs + list. The output clearly indicates that + snapshots can not be mounted directly into the system as + there is no path shown in the MOUNTPOINT + column. Additionally, there is no mention of available disk + space in the AVAIL column as snapshots + cannot be written after they are created. It becomes more + clear when comparing the snapshot with the original dataset + from which it was created: + + &prompt.root; zfs list -rt all bigpool/work/joe +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe 85.5K 1.29G 85.5K /usr/home/joe +bigpool/work/joe@backup 0 - 85.5K - + + Displaying both the dataset and the snapshot in one + output using zfs list -rt all reveals how + snapshots work in COW fashion. They save only the changes + (delta) that were made and not the whole filesystem contents + all over again. This means that snapshots do not take up + much space when there were not many changes being made in + the meantime. This becomes more apparent when creating a + second snapshot after making a change like copying a file to + the dataset after the first snapshot was taken. + + &prompt.root; cp /etc/passwd bigpool/work/joe +&prompt.root; zfs snapshot bigpool/work/joe@after_cp +&prompt.root; zfs list -rt all bigpool/work/joe +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe 115K 1.29G 88K /usr/home/joe +bigpool/work/joe@backup 27K - 85.5K - +bigpool/work/joe@after_cp 0 - 88K - + + The second snapshot contains only the changes on the + dataset after the copy operation. This yields enormous + space savings. Note that the snapshot + bigpool/work/joe@backup + also changed in the output of the USED + column to indicate the changes between itself and the + snapshot taken afterwards. + + + + Comparing Snapshots + + ZFS provides a built-in command to compare the + differences in content between two snapshots. This is + helpful when many snapshots were taken over time and the + user wants to know the filesystem has changed over time. + For example, a user can determine what the latest snapshot + is that still contains a file that was accidentally deleted + using zfs diff. Doing this for the two + snapshots that were created in the previous section yields + the following output: + + &prompt.root; zfs list -rt all bigpool/work/joe +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe 115K 1.29G 88K /usr/home/joe +bigpool/work/joe@backup 27K - 85.5K - +bigpool/work/joe@after_cp 0 - 88K - +&prompt.root; zfs diff bigpool/work/joe@backup +M /usr/home/bcr/ ++ /usr/home/bcr/passwd + + The command lists the changes between the most recent + snapshot (in this case + bigpool/work/joe@after_cp) + and the one provided as a parameter to zfs + diff. The first column indicates the type of + change according to the following table: + + + + + + + + The path or file was added. + + + + - + The path or file was deleted. + + + + M + The path or file was modified. + + + + R + The path or file was renamed. + + + + + + By comparing the output with the table, it becomes clear + that passwd + was added after the snapshot + bigpool/work/joe@backup + was created. This resulted also in a modification of the + parent dataset mounted at + /usr/home/joe + because, among other things, the directory listing would now + include the new file. + + Comparing the contents of two snapshots is helpful when + using ZFS' replication feature to transfer a dataset to a + different host for backup purposes. A backup administrator + can compare the two snapshots he just received from the + sending host and figure out what the actual changes in the + dataset were (provided the dataset is not encrypted). See + the Replication section + for more information. + + + + Snapshot Rollback + + Once at least one snapshot is available, it can be + rolled back to at any time. Most of the time this is the + case when the current state of the dataset is no longer + required and an older version is preferred. Scenarios like + local development tests have gone wrong, botched system + updates hamper the systems overall functionality or the + requirement to restore accidentally deleted files or + directories are all too common occurances. Luckily, rolling + back a snapshot is just as easy as typing zfs + rollback + snapshotname. + Depending on how many changes are involved, the operation + will finish in a certain amout of time. During that time, + the dataset always remains in a consistent state, much like + a database that conforms to ACID principles is performing a + rollback. This is happening while the dataset is live and + accessible without requiring a downtime. Once the snapshot + has been rolled back, the dataset has the same state as it + had when the snapshot was originally taken. All other data + in that dataset that was not part of the snapshot is + discarded. Taking a snapshot of the current state of the + dataset before rolling back to a previous one is a good idea + when some data is required later. This way, the user can + roll back and forth between snapshots without losing data + that is still valuable. + + In the first example, a snapshot is rolled back because + of a careless rm operation that removes + too much data than was intended. + + &prompt.root; zfs list -rt all bigpool/work/joe +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe 115K 1.29G 88K /usr/home/joe +bigpool/work/joe@santa 27K - 85.5K - +bigpool/work/joe@summerplan 0 - 88K - +&prompt.user; ls +santaletter.txt summerholiday.txt +&prompt.user; rm s* +&prompt.user; ls +&prompt.user; + + At this point, the user realized that too many files + were deleted and wants them back. ZFS provides an easy way + to get them back using rollbacks, but only when snapshots of + important data are performed on a regular basis. To get the + files back and start over from the last snapshot, issue the + following command: + + &prompt.root; zfs rollback bigpool/work/joe@summerplan +&prompt.user; ls +santaletter.txt summerholiday.txt + + The rollback operation restored the dataset to the state + of the last snapshot. It is also possible to roll back to a + snapshot that was taken much earlier and has other snapshots + following after it. When trying to do this, ZFS will issue + the following warning: + + &prompt.root; zfs list -t snapshot +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe@santa 27K - 85.5K - +bigpool/work/joe@summerplan 0 - 88K - +&prompt.root; zfs rollback bigpool/work/joe@santa +cannot rollback to 'bigpool/work/joe@santa': more recent snapshots exist +use '-r' to force deletion of the following snapshots: +bigpool/work/joe@summerplan + + This warning means that when snapshots exist between the + current state of the dataset and the snapshot the user wants + to roll back to, these snapshots must be deleted. This is + because ZFS can not track all the changes between different + states of the dataset in time since snapshots are read-only. + As a precaution, ZFS will not delete the affected snapshots, + but offers to use the parameter when + this is the desired action. If that is what the intention + is and the consequences of losing all intermediate snapshots + is understood, the command can be issued as follows: + + &prompt.root; zfs rollback -r bigpool/work/joe@santa +&prompt.root; zfs list -t snapshot +NAME USED AVAIL REFER MOUNTPOINT +bigpool/work/joe@santa 27K - 85.5K - +&prompt.user; ls +santaletter.txt + + The output from zfs list -t snapshot + confirms that the snapshot + bigpool/work/joe@summerplan + was removed as a result of zfs rollback + -r. + + + + Restoring Individual Files from Snapshots + + Snapshots are mounted in a hidden directory under the + parent dataset: .zfs/snapshots/snapshotname. + By default, these directories will not be displayed even + when a standard ls -a is issued. + Although the directory is not displayed, it is there + nevertheless and can be accessed like any normal directory. + ZFS maintains a property named snapdir + that controls whether these hidden directories show up in a + directory listing. Setting the property to + visible will let them show up in the + output of ls and any other that deal with + directory contents. + + &prompt.root; zfs get snapdir bigpool/work/joe +NAME PROPERTY VALUE SOURCE +bigpool/work/joe snapdir hidden default +&prompt.user; ls -a +. santaletter.txt +.. summerholiday.txt +&prompt.root; zfs set snapdir=visible bigpool/work/joe +&prompt.user; ls -a +. .zfs santaletter.txt +.. summerholiday.txt + + Individual files can easily be restored to a previous + state by copying them from the snapshot back to the parent + dataset. The directory structure below .zfs/snapshot has a directory + named exactly like the snapshots taken earlier to make it + easier to identify them. In the following example, it is + assumed that a file should be restored from the hidden + .zfs directory by + copying it from the snapshot that contained the latest + version of the file: + + &prompt.root; ls .zfs/snapshot +santa summerplan +&prompt.root; ls .zfs/snapshot/summerplan +summerholiday.txt +&prompt.root; cp .zfs/snapshot/summerplan/summerholiday.txt /bigpool/work/joe + + Note that when the command ls + .zfs/snapshot was issued, the property + snapdir could be set to hidden and it + would still be possible to list the contents of that + directory. It is up to the administrator to decide whether + these directories should be displayed. Of course, it is + possible to display these for certain datasets and prevent + it for others. Copying files or directories from these + hidden .zfs/snapshot + is simple enough. Trying it the other way around results in + the following error: + + &prompt.root; cp /etc/rc.conf .zfs/snapshot/santa/ +cp: .zfs/snapshot/santa/rc.conf: Read-only file system + + This error reminds the user that snapshots are read-only + and can not be changed after they have been created. No + files can be copied into or removed from snapshot + directories because that would change the state of the + dataset they represent. + + Snapshots consume space based on how much the parent + file system has changed since the time of the snapshot. The + written property of a snapshot tracks how + much space is being used by the snapshot. + + Snapshots are destroyed and the space reclaimed with + zfs destroy + dataset@snapshot. + Adding recursively removes all snapshots + with the same name under the parent dataset. Adding + to the command displays a list of the + snapshots that would be deleted and an estimate of how much + space would be reclaimed without performing the actual + destroy operation. + @@ -1347,14 +1660,98 @@ tank custom:costcenter - A clone is a copy of a snapshot that is treated more like a regular dataset. Unlike a snapshot, a clone is not read only, is mounted, and can have its own properties. Once a - clone has been created, the snapshot it was created from - cannot be destroyed. The child/parent relationship between - the clone and the snapshot can be reversed using - zfs promote. After a clone has been - promoted, the snapshot becomes a child of the clone, rather - than of the original parent dataset. This will change how the - space is accounted, but not actually change the amount of - space consumed. + clone has been created using zfs clone, the + snapshot it was created from cannot be destroyed. The + child/parent relationship between the clone and the snapshot + can be reversed using zfs promote. After a + clone has been promoted, the snapshot becomes a child of the + clone, rather than of the original parent dataset. This will + change how the space is accounted, but not actually change the + amount of space consumed. The clone can be mounted at any + point within the ZFS filesystem hierarchy, not just below the + original location of the snapshot. + + To demonstrate the clone feature, the following example + dataset is used: + + &prompt.root; zfs list -rt all camino/home/joe +NAME USED AVAIL REFER MOUNTPOINT +camino/home/joe 108K 1.3G 87K /usr/home/joe +camino/home/joe@plans 21K - 85.5K - +camino/home/joe@backup 0K - 87K - + + A typical use case for clones is to experiment with a + specific dataset while keeping the snapshot around to fall + back to in case something goes wrong. Since snapshots can not + be changed, a clone of a snapshot is created to perform the + changes in. Once the desired result is achieved, the old + filesystem can be removed after promoting the clone to a + dataset to replace it. This is not strictly necessary as the + clone and dataset can coexist side by side with each other + without causing problems. + + &prompt.root; zfs clone camino/home/joe@backup camino/home/joenew +&prompt.root; ls /usr/home/joe* +/usr/home/joe: +backup.txz plans.txt + +/usr/home/joenew: +backup.txz plans.txt +&prompt.root; df -h /usr/home +Filesystem Size Used Avail Capacity Mounted on +usr/home/joe 1.3G 31k 1.3G 0% /usr/home/joe +usr/home/joenew 1.3G 31k 1.3G 0% /usr/home/joenew + + After a clone is created it is an exact copy of the state + the dataset was in when the snapshot was taken. The clone can + now be changed independently from its originating dataset. + The only connection between the two is the snapshot. ZFS + records this connection in the property + origin. Once the dependency between the + snapshot and the clone has been removed by promoting the clone + using zfs promote, the + origin of the clone is removed as it is now + an independent dataset. The following example demonstrates + this: + + &prompt.root; zfs get origin camino/home/joenew +NAME PROPERTY VALUE SOURCE +camino/home/joenew origin camino/home/joe@backup - +&prompt.root; zfs promote camino/home/joenew +&prompt.root; zfs get origin camino/home/joenew +NAME PROPERTY VALUE SOURCE +camino/home/joenew origin - - + + After making some changes like copying + loader.conf to the promoted clone for + example, the old directory becomes obsolete in this case. + Instead, the promoted clone should replace it. This can be + achieved by two consecutive commands: zfs + destroy on the old dataset and zfs + rename on the clone to name it like the old + dataset (it could also get an entirely different name). + + &prompt.root; cp /boot/defaults/loader.conf /usr/home/joenew +&prompt.root; zfs destroy -f camino/home/joe +&prompt.root; zfs rename camino/home/joenew camino/home/joe +&prompt.root; ls /usr/home/joe +backup.txz loader.conf plans.txt +&prompt.root; df -h /usr/home +Filesystem Size Used Avail Capacity Mounted on +usr/home/joe 1.3G 128k 1.3G 0% /usr/home/joe + + The cloned snapshot is now handled by ZFS like an ordinary + dataset. It contains all the data from the original snapshot + plus the files that were added to it like + loader.conf. Clones can be used in + different scenarios to provide useful features to ZFS users. + For example, jails could be provided as snapshots containing + different sets of installed applications. Users can clone + these snapshots and add their own applications as they see + fit. Once they are satisfied with the changes, the clones can + be promoted to full datasets and provided to end users to work + with like they would with a real dataset. This saves time and + administrative overhead when providing these jails. @@ -2459,7 +2856,8 @@ vfs.zfs.vdev.cache.size="5M"ZFS. - + + From owner-svn-doc-projects@FreeBSD.ORG Fri May 16 14:10:39 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A84C0B85; Fri, 16 May 2014 14:10:39 +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 89C07232C; Fri, 16 May 2014 14:10:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GEAdkI062502; Fri, 16 May 2014 14:10:39 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GEAdlD062501; Fri, 16 May 2014 14:10:39 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201405161410.s4GEAdlD062501@svn.freebsd.org> From: Benedict Reuschling Date: Fri, 16 May 2014 14:10:39 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44847 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 14:10:39 -0000 Author: bcr Date: Fri May 16 14:10:39 2014 New Revision: 44847 URL: http://svnweb.freebsd.org/changeset/doc/44847 Log: Corrections on the ZFS chapter: - updates on sysctls for limiting IOPS during a scrub or resilver - wording and grammar fixes - comment out sections that will come in later once the chapter is officially available in the handbook Submitted by: Allan Jude Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Fri May 16 12:32:45 2014 (r44846) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Fri May 16 14:10:39 2014 (r44847) @@ -671,7 +671,7 @@ errors: No known data errors Scrubbing a Pool Pools should be - Scrubbed regularly, + scrubbed regularly, ideally at least once every three months. The scrub operating is very disk-intensive and will reduce performance while running. Avoid high-demand @@ -691,7 +691,7 @@ errors: No known data errors config: NAME STATE READ WRITE CKSUM - mypool ONLINE 0 0 0 + mypool ONLINE 0 0 0 raidz2-0 ONLINE 0 0 0 ada0p3 ONLINE 0 0 0 ada1p3 ONLINE 0 0 0 @@ -701,6 +701,10 @@ config: ada5p3 ONLINE 0 0 0 errors: No known data errors + + In the event that a scrub operation needs to be cancelled, + issue zpool scrub -s + mypool. @@ -1247,17 +1251,20 @@ Filesystem Size Used Avail Cap Renaming a Dataset The name of a dataset can be changed with zfs - rename. rename can also be - used to change the parent of a dataset. Renaming a dataset to - be under a different parent dataset will change the value of - those properties that are inherited by the child dataset. - When a dataset is renamed, it is unmounted and then remounted - in the new location (inherited from the parent dataset). This - behavior can be prevented with . Due to - the nature of snapshots, they cannot be renamed outside of the - parent dataset. To rename a recursive snapshot, specify - , and all snapshots with the same specified - snapshot will be renamed. + rename. To change the parent of a dataset + rename can also be used. Renaming a + dataset to be under a different parent dataset will change the + value of those properties that are inherited from the parent + dataset. When a dataset is renamed, it is unmounted and then + remounted in the new location (which is inherited from the new + parent dataset). This behavior can be prevented with + . + + Snapshots can also be renamed in this way. Due to + the nature of snapshots, they cannot be renamed into a + different parent dataset. To rename a recursive snapshot, + specify , and all snapshots with the same + name in child datasets with also be renamed. @@ -1314,7 +1321,7 @@ tank custom:costcenter - older version of the data on disk. When no snapshot is created, ZFS simply reclaims the space for future use. Snapshots preserve disk space by recording only the - differences that happened between snapshots. ZFS llow + differences that happened between snapshots. ZFS allows snapshots only on whole datasets, not on individual files or directories. When a snapshot is created from a dataset, everything contained in it, including the filesystem @@ -1357,17 +1364,17 @@ NAME USED AVAIL R bigpool/work/joe@backup 0 - 85.5K - Snapshots are not listed by a normal zfs - list operation. In order to list the snapshot - that was just created, the option -t - snapshot has to be appended to zfs - list. The output clearly indicates that - snapshots can not be mounted directly into the system as - there is no path shown in the MOUNTPOINT - column. Additionally, there is no mention of available disk - space in the AVAIL column as snapshots - cannot be written after they are created. It becomes more - clear when comparing the snapshot with the original dataset - from which it was created: + list operation. To list the snapshot that was + just created, the option -t snapshot has + to be appended to zfs list. The output + clearly indicates that snapshots can not be mounted directly + into the system as there is no path shown in the + MOUNTPOINT column. Additionally, there + is no mention of available disk space in the + AVAIL column as snapshots cannot be + written after they are created. It becomes more clear when + comparing the snapshot with the original dataset from which + it was created: &prompt.root; zfs list -rt all bigpool/work/joe NAME USED AVAIL REFER MOUNTPOINT @@ -2262,16 +2269,21 @@ dedup = 1.05, compress = 1.11, copies = After zdb -S finishes analyzing the pool, it shows the space reduction ratio that would be achieved by activating deduplication. In this case, - 1.16 is a very poor ratio that is mostly - influenced by compression. Activating deduplication on this - pool would not save any significant amount of space. Using - the formula dedup * compress / copies = - deduplication ratio, system administrators can plan - the storage allocation more towards having multiple copies of - data or by having a decent compression rate in order to - utilize the space savings that deduplication provides. As a - rule of thumb, compression should be used before deduplication - due to the much lower memory requirements. + 1.16 is a very poor space saving ratio that + is mostly provided by compression. Activating deduplication + on this pool would not save any significant amount of space, + and is not worth the amount of memory required to enable + deduplication. Using the formula dedup * compress / + copies = deduplication ratio, system administrators + can plan the storage allocation, deciding if the workload will + contain enough duplicate blocks to make the memory + requirements pay off. If the data is reasonably compressible, + the space savings may be very good and compression can also + provide greatly increased performance. It is recommended to + use compression first and only enable deduplication in cases + where the additional savings will be considerable and there is + sufficient memory for the DDT. @@ -2567,45 +2579,30 @@ mypool/compressed_dataset logicalused - - vfs.zfs.no_scrub_io - - Disable scrub - I/O. Causes scrub to not actually read - the data blocks and verify their checksums, effectively - turning any scrub in progress into a - no-op. This may be useful if a scrub - is interferring with other operations on the pool. This - value can be adjusted at any time with - &man.sysctl.8;. - - If this tunable is set to cancel an - in-progress scrub, be sure to unset - it afterwards or else all future - scrub and resilver operations - will be ineffective. - - - vfs.zfs.scrub_delay - - Determines the milliseconds of delay inserted between + - Determines the number of ticks to delay between each I/O during a scrub. To ensure that a scrub does not interfere with the normal operation of the pool, if any other I/O is happening the scrub will - delay between each command. This value allows you to - limit the total IOPS (I/Os Per Second) - generated by the scrub. The default - value is 4, resulting in a limit of: 1000  ms / 4 = + delay between each command. This value controls the limit + on the total IOPS (I/Os Per Second) + generated by the scrub. The + granularity of the setting is deterined by the value of + kern.hz which defaults to 1000 ticks + per second. This setting may be changed, resulting in + a different effective IOPS limit. The + default value is 4, resulting in a limit of: + 1000 ticks/sec / 4 = 250 IOPS. Using a value of 20 would give a limit of: - 1000 ms / 20 = 50 IOPS. The - speed of scrub is only limited when - there has been only recent activity on the pool, as - determined by IOPS. The speed of + scrub is only limited when there has + been recent activity on the pool, as determined by + vfs.zfs.scan_idle. This value can be adjusted at any time with &man.sysctl.8;. @@ -2620,10 +2617,15 @@ mypool/compressed_dataset logicalused that a resilver does not interfere with the normal operation of the pool, if any other I/O is happening the resilver will delay - between each command. This value allows you to limit the + between each command. This value controls the limit of total IOPS (I/Os Per Second) generated - by the resilver. The default value is - 2, resulting in a limit of: 1000  ms / 2 = + by the resilver. The granularity of + the setting is determined by the value of + kern.hz which defaults to 1000 ticks + per second. This setting may be changed, resulting in + a different effective IOPS limit. The + default value is 2, resulting in a limit of: + 1000 ticks/sec / 2 = 500 IOPS. Returning the pool to an Online state may be more important if another device failing could + <acronym>ZFS</acronym> on i386 @@ -2851,10 +2855,10 @@ vfs.zfs.vdev.cache.size="5M" &os; 9.0 and 9.1 include support for - ZFS version 28. Future versions + ZFS version 28. Later versions use ZFS version 5000 with feature - flags. This allows greater cross-compatibility with - other implementations of + flags. The new feature flags system allows greater + cross-compatibility with other implementations of ZFS. @@ -3407,7 +3411,7 @@ vfs.zfs.vdev.cache.size="5M" @@ -3476,7 +3480,7 @@ vfs.zfs.vdev.cache.size="5M"vfs.zfs.scrub_delay to prevent the scrub from degrading the performance of - other workloads on your pool. + other workloads on the pool. @@ -3563,7 +3567,8 @@ vfs.zfs.vdev.cache.size="5M" + and files. + From owner-svn-doc-projects@FreeBSD.ORG Sat May 17 03:35:45 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9CE1C02; Sat, 17 May 2014 03:35:45 +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 C72F12764; Sat, 17 May 2014 03:35:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4H3Zj0c050422; Sat, 17 May 2014 03:35:45 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4H3Zjrs050421; Sat, 17 May 2014 03:35:45 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201405170335.s4H3Zjrs050421@svn.freebsd.org> From: Benedict Reuschling Date: Sat, 17 May 2014 03:35:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44850 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 03:35:45 -0000 Author: bcr Date: Sat May 17 03:35:45 2014 New Revision: 44850 URL: http://svnweb.freebsd.org/changeset/doc/44850 Log: Fixes to grammar and language for the section on snapshots and clones that I added a while back. Submitted by: bjk Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Sat May 17 02:50:17 2014 (r44849) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Sat May 17 03:35:45 2014 (r44850) @@ -1325,28 +1325,28 @@ tank custom:costcenter - snapshots only on whole datasets, not on individual files or directories. When a snapshot is created from a dataset, everything contained in it, including the filesystem - properties, files, directories, permissions, etc. are + properties, files, directories, permissions, etc., is duplicated. - Snapshots provide a variety of uses that other filesystems - with snapshot functionality do not have. A typical example - for snapshots is to have a quick way of backing up the current - state of the filesystem when a risky action like a software - installation or a system upgrade is performed. When the - action fails, the snapshot can be rolled back and the system - has the same state as when the snapshot was created. If the - upgrade was successful, the snapshot can be deleted to free up - space. Without snapshots and a failed upgrade a restore from - backup is often required, which is tedious, time consuming and - may require a downtime in which the system cannot be used as - normal. Snapshots can be rolled back quickly and can be done - when the system is running in normal operation, with little or - no downtime. The time savings are enormous considering - multi-terabyte storage systems and the time required to copy - the data from backup. Snapshots are not a replacement for a - complete backup of a pool, but can be used as a quick and easy - way to store a copy of the dataset at a specific point in - time. + ZFS Snapshots provide a variety of uses that other + filesystems with snapshot functionality do not have. A + typical example for snapshots is to have a quick way of + backing up the current state of the filesystem when a risky + action like a software installation or a system upgrade is + performed. When the action fails, the snapshot can be rolled + back and the system has the same state as when the snapshot + was created. If the upgrade was successful, the snapshot can + be deleted to free up space. Without snapshots, when a failed + upgrade occurs, a restore from backup is often required, which + is tedious, time consuming and may require a downtime in which + the system cannot be used as normal. Snapshots can be rolled + back quickly and can be taken when the system is running in + normal operation, with little or no downtime. The time + savings are enormous considering multi-terabyte storage + systems and the time required to copy the data from backup. + Snapshots are not a replacement for a complete backup of a + pool, but can be used as a quick and easy way to store a copy + of the dataset at a specific point in time. Creating Snapshots @@ -1372,9 +1372,9 @@ bigpool/work/joe@backup 0 - 8 MOUNTPOINT column. Additionally, there is no mention of available disk space in the AVAIL column as snapshots cannot be - written after they are created. It becomes more clear when - comparing the snapshot with the original dataset from which - it was created: + written to after they are created. It becomes more clear + when comparing the snapshot with the original dataset from + which it was created: &prompt.root; zfs list -rt all bigpool/work/joe NAME USED AVAIL REFER MOUNTPOINT @@ -1489,13 +1489,13 @@ M /usr/home/bcr/ Once at least one snapshot is available, it can be rolled back to at any time. Most of the time this is the case when the current state of the dataset is no longer - required and an older version is preferred. Scenarios like - local development tests have gone wrong, botched system - updates hamper the systems overall functionality or the + required and an older version is preferred. Scenarios such + as local development tests have gone wrong, botched system + updates hampering the system's overall functionality, or the requirement to restore accidentally deleted files or - directories are all too common occurances. Luckily, rolling - back a snapshot is just as easy as typing zfs - rollback + directories are all too common occurrences. Luckily, + rolling back a snapshot is just as easy as typing + zfs rollback snapshotname. Depending on how many changes are involved, the operation will finish in a certain amout of time. During that time, @@ -1592,8 +1592,8 @@ santaletter.txt that controls whether these hidden directories show up in a directory listing. Setting the property to visible will let them show up in the - output of ls and any other that deal with - directory contents. + output of ls and any others that deal + with directory contents. &prompt.root; zfs get snapdir bigpool/work/joe NAME PROPERTY VALUE SOURCE @@ -1730,7 +1730,7 @@ NAME PROPERTY VALUE camino/home/joenew origin - - After making some changes like copying - loader.conf to the promoted clone for + loader.conf to the promoted clone, for example, the old directory becomes obsolete in this case. Instead, the promoted clone should replace it. This can be achieved by two consecutive commands: zfs From owner-svn-doc-projects@FreeBSD.ORG Sat May 17 04:28:45 2014 Return-Path: Delivered-To: svn-doc-projects@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 1508CBE; Sat, 17 May 2014 04:28:45 +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 01C012BF6; Sat, 17 May 2014 04:28:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4H4SieF082034; Sat, 17 May 2014 04:28:44 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4H4SicD082033; Sat, 17 May 2014 04:28:44 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201405170428.s4H4SicD082033@svn.freebsd.org> From: Benedict Reuschling Date: Sat, 17 May 2014 04:28:44 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44851 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 04:28:45 -0000 Author: bcr Date: Sat May 17 04:28:44 2014 New Revision: 44851 URL: http://svnweb.freebsd.org/changeset/doc/44851 Log: Reducing the output of igor -y chapter.xml to only include those sentences where these fill-words actually make sense. In addition to that, add acronym tags around another occurance of RAM. With help from: Allan Jude Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Sat May 17 03:35:45 2014 (r44850) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Sat May 17 04:28:44 2014 (r44851) @@ -166,7 +166,7 @@ example 17547136 0 17547136 This output shows that the example pool has been created and mounted. It is now accessible as a file system. Files may be created on it and - users can browse it, as seen in the following example: + users can browse it, like in this example: &prompt.root; cd /example &prompt.root; ls @@ -232,7 +232,7 @@ example/compressed on /example/compresse ZFS datasets, after creation, may be used like any file systems. However, many other features are available which can be set on a per-dataset basis. In the - following example, a new file system, data + example below, a new file system, data is created. Important files will be stored here, the file system is set to keep two copies of each data block: @@ -345,7 +345,7 @@ example/data 17547008 0 175 It is possible to write a script to perform regular snapshots on user data. However, over time, snapshots can consume a great deal of disk space. The previous snapshot can - be removed using the following command: + be removed using the command: &prompt.root; zfs destroy storage/home@08-30-08 @@ -460,7 +460,7 @@ errors: No known data errors ZFS uses checksums to verify the integrity of stored data. These are enabled automatically upon creation of file systems and may be disabled using the - following command: + command: &prompt.root; zfs set checksum=off storage/home @@ -670,13 +670,13 @@ errors: No known data errors Scrubbing a Pool - Pools should be - scrubbed regularly, - ideally at least once every three months. The - scrub operating is very disk-intensive and - will reduce performance while running. Avoid high-demand - periods when scheduling scrub or use vfs.zfs.scrub_delay + It is recommended that pools be scrubbed regularly, ideally + at least once every month. The scrub + operating is very disk-intensive and will reduce performance + while running. Avoid high-demand periods when scheduling + scrub or use vfs.zfs.scrub_delay to adjust the relative priority of the scrub to prevent it interfering with other workloads. @@ -731,7 +731,7 @@ errors: No known data errors interaction of a system administrator during normal pool operation. - The following example will demonstrate this self-healing + The next example will demonstrate this self-healing behavior in ZFS. First, a mirrored pool of two disks /dev/ada0 and /dev/ada1 is created. @@ -824,7 +824,7 @@ errors: No known data errors ZFS has detected the error and took care of it by using the redundancy present in the unaffected ada0 mirror disk. A checksum comparison - with the original one should reveal whether the pool is + with the original one will reveal whether the pool is consistent again. &prompt.root; sha1 /healer >> checksum.txt @@ -873,9 +873,8 @@ errors: No known data errors ada0 and corrects all data that has a wrong checksum on ada1. This is indicated by the (repairing) output from - zpool status. After the - operation is complete, the pool status has changed to the - following: + zpool status. After the operation is + complete, the pool status has changed to: &prompt.root; zpool status healer pool: healer @@ -1073,7 +1072,7 @@ History for 'tank': pool (consisting of /dev/ada0 and /dev/ada1). In addition to that, the hostname (myzfsbox) is also shown in the - commands following the pool's creation. The hostname display + commands after the pool's creation. The hostname display becomes important when the pool is exported from the current and imported on another system. The commands that are issued on the other system can clearly be distinguished by the @@ -1317,16 +1316,15 @@ tank custom:costcenter - of the most powerful features of ZFS. A snapshot provides a read-only, point-in-time copy of the dataset. Due to ZFS' Copy-On-Write (COW) implementation, - snapshots can be created quickly simply by preserving the - older version of the data on disk. When no snapshot is - created, ZFS simply reclaims the space for future use. - Snapshots preserve disk space by recording only the - differences that happened between snapshots. ZFS allows - snapshots only on whole datasets, not on individual files or - directories. When a snapshot is created from a dataset, - everything contained in it, including the filesystem - properties, files, directories, permissions, etc., is - duplicated. + snapshots can be created quickly by preserving the older + version of the data on disk. When no snapshot is created, ZFS + reclaims the space for future use. Snapshots preserve disk + space by recording only the differences that happened between + snapshots. ZFS allows snapshots only on whole datasets, not + on individual files or directories. When a snapshot is + created from a dataset, everything contained in it, including + the filesystem properties, files, directories, permissions, + etc., is duplicated. ZFS Snapshots provide a variety of uses that other filesystems with snapshot functionality do not have. A @@ -1354,8 +1352,8 @@ tank custom:costcenter - Create a snapshot with zfs snapshot dataset@snapshotname. Adding creates a snapshot recursively, - with the same name on all child datasets. The following - example creates a snapshot of a home directory: + with the same name on all child datasets. This example + creates a snapshot of a home directory: &prompt.root; zfs snapshot bigpool/work/joe@backup @@ -1419,7 +1417,7 @@ bigpool/work/joe@after_cp 0 - is that still contains a file that was accidentally deleted using zfs diff. Doing this for the two snapshots that were created in the previous section yields - the following output: + this output: &prompt.root; zfs list -rt all bigpool/work/joe NAME USED AVAIL REFER MOUNTPOINT @@ -1435,7 +1433,7 @@ M /usr/home/bcr/ bigpool/work/joe@after_cp) and the one provided as a parameter to zfs diff. The first column indicates the type of - change according to the following table: + change according to this table: @@ -1532,7 +1530,7 @@ santaletter.txt summerholiday.txt to get them back using rollbacks, but only when snapshots of important data are performed on a regular basis. To get the files back and start over from the last snapshot, issue the - following command: + command: &prompt.root; zfs rollback bigpool/work/joe@summerplan &prompt.user; ls @@ -1541,8 +1539,8 @@ santaletter.txt summerholiday.txtThe rollback operation restored the dataset to the state of the last snapshot. It is also possible to roll back to a snapshot that was taken much earlier and has other snapshots - following after it. When trying to do this, ZFS will issue - the following warning: + that were created after it. When trying to do this, ZFS + will issue this warning: &prompt.root; zfs list -t snapshot NAME USED AVAIL REFER MOUNTPOINT @@ -1611,11 +1609,11 @@ bigpool/work/joe snapdir hidden dataset. The directory structure below .zfs/snapshot has a directory named exactly like the snapshots taken earlier to make it - easier to identify them. In the following example, it is - assumed that a file should be restored from the hidden - .zfs directory by - copying it from the snapshot that contained the latest - version of the file: + easier to identify them. In the next example, it is assumed + that a file is to be restored from the hidden .zfs directory by copying it + from the snapshot that contained the latest version of the + file: &prompt.root; ls .zfs/snapshot santa summerplan @@ -1628,12 +1626,12 @@ summerholiday.txt snapdir could be set to hidden and it would still be possible to list the contents of that directory. It is up to the administrator to decide whether - these directories should be displayed. Of course, it is + these directories will be displayed. Of course, it is possible to display these for certain datasets and prevent it for others. Copying files or directories from these hidden .zfs/snapshot is simple enough. Trying it the other way around results in - the following error: + this error: &prompt.root; cp /etc/rc.conf .zfs/snapshot/santa/ cp: .zfs/snapshot/santa/rc.conf: Read-only file system @@ -1678,8 +1676,8 @@ cp: .zfs/snapshot/santa/rc.conf: Read-on point within the ZFS filesystem hierarchy, not just below the original location of the snapshot. - To demonstrate the clone feature, the following example - dataset is used: + To demonstrate the clone feature, this example dataset is + used: &prompt.root; zfs list -rt all camino/home/joe NAME USED AVAIL REFER MOUNTPOINT @@ -1718,8 +1716,7 @@ usr/home/joenew 1.3G 31k 1.3G snapshot and the clone has been removed by promoting the clone using zfs promote, the origin of the clone is removed as it is now - an independent dataset. The following example demonstrates - this: + an independent dataset. This example demonstrates it: &prompt.root; zfs get origin camino/home/joenew NAME PROPERTY VALUE SOURCE @@ -1732,7 +1729,7 @@ camino/home/joenew origin - After making some changes like copying loader.conf to the promoted clone, for example, the old directory becomes obsolete in this case. - Instead, the promoted clone should replace it. This can be + Instead, the promoted clone can replace it. This can be achieved by two consecutive commands: zfs destroy on the old dataset and zfs rename on the clone to name it like the old @@ -1781,8 +1778,8 @@ usr/home/joe 1.3G 128k 1.3G zfs send and zfs receive, respectively. - The following examples will demonstrate the functionality - of ZFS replication using these two + These examples will demonstrate the functionality of + ZFS replication using these two pools: &prompt.root; zpool list @@ -1961,8 +1958,8 @@ mypool@replica2 before this can be done. Since this chapter is about ZFS and not about configuring SSH, it only lists the things required to perform the - zfs send operation. The following - configuration is required: + zfs send operation. This configuration + is required: @@ -2024,18 +2021,17 @@ vfs.usermount: 0 -> 1 zfs receive on the remote host backuphost via SSH. A fully qualified domain - name or IP address should be used here. The receiving - machine will write the data to + name or IP address is recommended be used here. The + receiving machine will write the data to backup dataset on the recvpool pool. Using - with zfs recv - will remove the original name of the pool on the receiving - side and just takes the name of the snapshot instead. + with zfs recv will + remove the original name of the pool on the receiving side + and just takes the name of the snapshot instead. causes the filesystem(s) to not be mounted on the receiving side. When is - included, more detail about the transfer is shown. - Included are elapsed time and the amount of data - transferred. + included, more detail about the transfer is shown. Included + are elapsed time and the amount of data transferred. @@ -2056,20 +2052,19 @@ vfs.usermount: 0 -> 1 To enforce a dataset quota of 10 GB for storage/home/bob, use the - following: + command: &prompt.root; zfs set quota=10G storage/home/bob To enforce a reference quota of 10 GB for storage/home/bob, use the - following: + command: &prompt.root; zfs set refquota=10G storage/home/bob The general format is userquota@user=size, - and the user's name must be in one of the following - formats: + and the user's name must be in one of these formats: @@ -2437,13 +2432,13 @@ mypool/compressed_dataset logicalused vfs.zfs.arc_max - Sets the maximum size of the ARC. - The default is all RAM less 1 GB, - or 1/2 of ram, whichever is more. However a lower value - should be used if the system will be running any other - daemons or processes that may require memory. This value - can only be adjusted at boot time, and is set in - /boot/loader.conf. + linkend="zfs-term-arc">ARC. The + default is all RAM less 1 GB, or 1/2 + of RAM, whichever is more. However, a + lower value should be used if the system will be running any + other daemons or processes that may require memory. This + value can only be adjusted at boot time, and is set in + /boot/loader.conf. @@ -2722,7 +2717,7 @@ mypool/compressed_dataset logicalused Due to the address space limitations of the &i386; platform, ZFS users on the - &i386; architecture should add this option to a + &i386; architecture must add this option to a custom kernel configuration file, rebuild the kernel, and reboot: From owner-svn-doc-projects@FreeBSD.ORG Mon May 26 04:16:17 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09FF4984; Mon, 26 May 2014 04:16:17 +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 EAD83224A; Mon, 26 May 2014 04:16:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4Q4GGGN062014; Mon, 26 May 2014 04:16:16 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4Q4GGMZ062013; Mon, 26 May 2014 04:16:16 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201405260416.s4Q4GGMZ062013@svn.freebsd.org> From: Warren Block Date: Mon, 26 May 2014 04:16:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44954 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 04:16:17 -0000 Author: wblock Date: Mon May 26 04:16:16 2014 New Revision: 44954 URL: http://svnweb.freebsd.org/changeset/doc/44954 Log: Editorial pass done. Sections zfs-zfs-snapshot-creation through zfs-zfs-clones need less confusing examples and rewrites to match. zfs-send-ssh needs a clearer explanation of the -d option and possibly examples. Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Mon May 26 00:18:22 2014 (r44953) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Mon May 26 04:16:16 2014 (r44954) @@ -49,10 +49,8 @@ designs. Originally developed at &sun;, ongoing ZFS - development has moved to the - OpenZFS Project. - describes the development history in - more detail. + development has moved to the OpenZFS Project. ZFS has three major design goals: @@ -101,31 +99,31 @@ created on a single disk at a time. If there were two disks then two separate file systems would have to be created. In a traditional hardware RAID configuration, this - problem was worked around by presenting the operating system - with a single logical disk made up of the space provided by a - number of disks, on top of which the operating system placed its + problem was avoided by presenting the operating system with a + single logical disk made up of the space provided by a number of + physical disks, on top of which the operating system placed a file system. Even in the case of software - RAID solutions like GEOM, - the UFS file system living on top of the - RAID transform believed that it was dealing - with a single device. ZFS's combination of - the volume manager and the file system solves this and allows - the creation of many file systems all sharing a pool of - available storage. One of the biggest advantages to - ZFS's awareness of the physical layout of the - disks is that ZFS can grow the existing file - systems automatically when additional disks are added to the + RAID solutions like those provided by + GEOM, the UFS file system + living on top of the RAID transform believed + that it was dealing with a single device. + ZFS's combination of the volume manager and + the file system solves this and allows the creation of many file + systems all sharing a pool of available storage. One of the + biggest advantages to ZFS's awareness of the + physical layout of the disks is that existing file systems can + be grown automatically when additional disks are added to the pool. This new space is then made available to all of the file systems. ZFS also has a number of different - properties that can be applied to each file system, creating - many advantages to creating a number of different filesystems - and datasets rather than a single monolithic filesystem. + properties that can be applied to each file system, giving many + advantages to creating a number of different filesystems and + datasets rather than a single monolithic filesystem. Quick Start Guide - There is a start up mechanism that allows &os; to mount + There is a startup mechanism that allows &os; to mount ZFS pools during system initialization. To enable it, add this line to /etc/rc.conf: @@ -149,7 +147,7 @@ Single Disk Pool To create a simple, non-redundant pool using a single - disk device, use zpool create: + disk device: &prompt.root; zpool create example /dev/da0 @@ -164,8 +162,8 @@ devfs 1 1 0 example 17547136 0 17547136 0% /example This output shows that the example pool - has been created and mounted. It is now - accessible as a file system. Files may be created on it and + has been created and mounted. It is now + accessible as a file system. Files can be created on it and users can browse it, like in this example: &prompt.root; cd /example @@ -186,15 +184,15 @@ drwxr-xr-x 21 root wheel 512 Aug 29 2 The example/compressed dataset is now a ZFS compressed file system. Try copying - some large files to /example/compressed. + some large files to + /example/compressed. Compression can be disabled with: &prompt.root; zfs set compression=off example/compressed To unmount a file system, use - zfs umount and then verify by using + zfs umount and then verify with df: &prompt.root; zfs umount example/compressed @@ -229,12 +227,13 @@ example on /example (zfs, local) example/data on /example/data (zfs, local) example/compressed on /example/compressed (zfs, local) - ZFS datasets, after creation, may be + After creatopm, ZFS datasets can be used like any file systems. However, many other features are available which can be set on a per-dataset basis. In the - example below, a new file system, data - is created. Important files will be stored here, the file - system is set to keep two copies of each data block: + example below, a new file system called + data is created. Important files will be + stored here, so it is configured to keep two copies of each + data block: &prompt.root; zfs create example/data &prompt.root; zfs set copies=2 example/data @@ -255,13 +254,12 @@ example/data 17547008 0 175 amount of available space. This is the reason for using df in these examples, to show that the file systems use only the amount of space they need and all draw - from the same pool. The ZFS file system - does away with concepts such as volumes and partitions, and - allows for several file systems to occupy the same - pool. + from the same pool. ZFS eliminates + concepts such as volumes and partitions, and allows multiple + file systems to occupy the same pool. To destroy the file systems and then destroy the pool as - they are no longer needed: + it is no longer needed: &prompt.root; zfs destroy example/compressed &prompt.root; zfs destroy example/data @@ -271,22 +269,21 @@ example/data 17547008 0 175 RAID-Z - Disks fail. One - method of avoiding data loss from disk failure is to - implement RAID. ZFS - supports this feature in its pool design. - RAID-Z pools require three or more disks - but yield more usable space than mirrored pools. + Disks fail. One method of avoiding data loss from disk + failure is to implement RAID. + ZFS supports this feature in its pool + design. RAID-Z pools require three or more + disks but provide more usable space than mirrored + pools. - To create a RAID-Z pool, use this - command, specifying the disks to add to the - pool: + This example creates a RAID-Z pool, + specifying the disks to add to the pool: &prompt.root; zpool create storage raidz da0 da1 da2 &sun; recommends that the number of devices used in a - RAID-Z configuration is between three and + RAID-Z configuration be between three and nine. For environments requiring a single pool consisting of 10 disks or more, consider breaking it up into smaller RAID-Z groups. If only two disks are @@ -295,21 +292,21 @@ example/data 17547008 0 175 more details. - This command creates the storage zpool. - This may be verified using &man.mount.8; and &man.df.1;. This - command makes a new file system in the pool called - home: + The previous example created the + storage zpool. This example makes a new + file system called home in that + pool: &prompt.root; zfs create storage/home - Now compression and keeping extra copies of directories - and files can be enabled with these commands: + Compression and keeping extra copies of directories + and files can be enabled: &prompt.root; zfs set copies=2 storage/home &prompt.root; zfs set compression=gzip storage/home To make this the new home directory for users, copy the - user data to this directory, and create the appropriate + user data to this directory and create the appropriate symbolic links: &prompt.root; cp -rp /home/* /storage/home @@ -317,28 +314,30 @@ example/data 17547008 0 175 &prompt.root; ln -s /storage/home /home &prompt.root; ln -s /storage/home /usr/home - Users now have their data stored on the freshly - created /storage/home. - Test by adding a new user and logging in as that user. + Users data is now stored on the freshly-created + /storage/home. Test by adding a new user + and logging in as that user. - Try creating a snapshot which can be rolled back - later: + Try creating a file system snapshot which can be rolled + back later: &prompt.root; zfs snapshot storage/home@08-30-08 - Note that the snapshot option will only capture a real - file system, not a home directory or a file. The - @ character is a delimiter used between the - file system name or the volume name. When a user's home - directory is accidentally deleted, restore it with: + Snapshots can only be made of a full file system, not a + single directory or file. + + The @ character is a delimiter between + the file system name or the volume name. If an important + directory has been accidentally deleted, the file system can + be backed up, then rolled back to an earlier snapshot when the + directory still existed: &prompt.root; zfs rollback storage/home@08-30-08 To list all available snapshots, run ls in the file system's - .zfs/snapshot - directory. For example, to see the previously taken - snapshot: + .zfs/snapshot directory. For example, to + see the previously taken snapshot: &prompt.root; ls /storage/home/.zfs/snapshot @@ -349,16 +348,15 @@ example/data 17547008 0 175 &prompt.root; zfs destroy storage/home@08-30-08 - After testing, - /storage/home can be - made the real /home - using this command: + After testing, /storage/home can be + made the real /home using this + command: &prompt.root; zfs set mountpoint=/home storage/home Run df and mount to confirm that the system now treats the file system as the real - /home: + /home: &prompt.root; mount /dev/ad0s1a on / (ufs, local) @@ -377,13 +375,14 @@ storage/home 26320512 0 26320512 This completes the RAID-Z configuration. Daily status updates about the file systems created can be generated as part of the nightly - &man.periodic.8; runs: + &man.periodic.8; runs. Add this line to + /etc/periodic.conf: - &prompt.root; echo 'daily_status_zfs_enable="YES"' >> /etc/periodic.conf + daily_status_zfs_enable="YES" - Recovering <acronym>RAID</acronym>-Z + Recovering <acronym>RAID-Z</acronym> Every software RAID has a method of monitoring its state. The status of @@ -394,7 +393,7 @@ storage/home 26320512 0 26320512 If all pools are Online and everything - is normal, the message indicates that: + is normal, the message shows: all pools are healthy @@ -459,32 +458,29 @@ errors: No known data errors ZFS uses checksums to verify the integrity of stored data. These are enabled automatically - upon creation of file systems and may be disabled using the - command: - - &prompt.root; zfs set checksum=off storage/home + upon creation of file systems. - Doing so is not recommended! - Checksums take very little storage space and provide data - integrity. Many ZFS features will not - work properly with checksums disabled. There is also no - noticeable performance gain from disabling these - checksums. + Checksums can be disabled, but it is + not recommended! Checksums take very + little storage space and provide data integrity. Many + ZFS features will not work properly with + checksums disabled. There is also no noticeable performance + gain from disabling these checksums. Checksum verification is known as - scrubbing. Verify the data integrity of the - storage pool, with this command: + scrubbing. Verify the data integrity of + the storage pool with this command: &prompt.root; zpool scrub storage The duration of a scrub depends on the amount of data - stored. Larger amounts of data will take considerably longer - to verify. Scrubs are very I/O intensive, - so much so that only one scrub may be run at a time. After - the scrub has completed, the status is updated and may be - viewed with status: + stored. Larger amounts of data will take proportionally + longer to verify. Scrubs are very I/O + intensive, and only one scrub is allowed to run at a time. + After the scrub completes, the status can be viewed with + status: &prompt.root; zpool status storage pool: storage @@ -503,8 +499,8 @@ errors: No known data errors The completion date of the last scrub operation is displayed to help track when another scrub is required. - Routine pool scrubs help protect data from silent corruption - and ensure the integrity of the pool. + Routine scrubs help protect data from silent corruption and + ensure the integrity of the pool. Refer to &man.zfs.8; and &man.zpool.8; for other ZFS options. @@ -514,24 +510,24 @@ errors: No known data errors <command>zpool</command> Administration - The administration of ZFS is divided - between two main utilities. The zpool - utility which controls the operation of the pool and deals with - adding, removing, replacing and managing disks, and the - zfs utility, - which deals with creating, destroying and managing datasets - (both filesystems and - volumes). + ZFS administration is divided between two + main utilities. The zpool utility controls + the operation of the pool and deals with adding, removing, + replacing, and managing disks. The + zfs utility + deals with creating, destroying, and managing datasets, + both filesystems and + volumes. - Creating & Destroying Storage Pools + Creating and Destroying Storage Pools - Creating a ZFS Storage Pool - (zpool) involves making a number of + Creating a ZFS storage pool + (zpool) involves making a number of decisions that are relatively permanent because the structure of the pool cannot be changed after the pool has been created. - The most important decision is what types of vdevs to group - the physical disks into. See the list of + The most important decision is what types of vdevs into which + to group the physical disks. See the list of vdev types for details about the possible options. After the pool has been created, most vdev types do not allow additional disks to be added to @@ -540,43 +536,41 @@ errors: No known data errors upgraded to mirrors by attaching an additional disk to the vdev. Although additional vdevs can be added to a pool, the layout of the pool cannot be changed once the pool has been - created, instead the data must be backed up and the pool - recreated. + created. Instead the data must be backed up and the pool + destroyed and recreated. - A ZFS pool that is no longer needed can - be destroyed so that the disks making up the pool can be - reused in another pool or for other purposes. Destroying a - pool involves unmounting all of the datasets in that pool. If - the datasets are in use, the unmount operation will fail and - the pool will not be destroyed. The destruction of the pool - can be forced with , but this can cause - undefined behavior in applications which had open files on - those datasets. + A pool that is no longer needed can be destroyed so that + the disks can be reused. Destroying a pool involves first + unmounting all of the datasets in that pool. If the datasets + are in use, the unmount operation will fail and the pool will + not be destroyed. The destruction of the pool can be forced + with , but this can cause undefined + behavior in applications which had open files on those + datasets. Adding and Removing Devices - Adding disks to a zpool can be broken down into two - separate cases: attaching a disk to an existing vdev with + There are two cases for adding disks to a zpool: attaching + a disk to an existing vdev with zpool attach, or adding vdevs to the pool - with zpool add. Only some vdev types allow disks to be - added to the vdev after creation. + with zpool add. Only some + vdev types allow disks to + be added to the vdev after creation. When adding disks to the existing vdev is not an option, - as in the case of RAID-Z, the other option is to add a vdev to - the pool. It is possible, but discouraged, to mix vdev types. + as for RAID-Z, the other option is to add a vdev to the pool. + It is possible, but discouraged, to mix vdev types. ZFS stripes data across each of the vdevs. For example, if there are two mirror vdevs, then this is effectively a RAID 10, striping the writes - across the two sets of mirrors. Because of the way that space - is allocated in ZFS to attempt to have each - vdev reach 100% full at the same time, there is a performance - penalty if the vdevs have different amounts of free - space. + across the two sets of mirrors. Space is allocated so that + each vdev reaches 100% full at the same time, so there is a + performance penalty if the vdevs have different amounts of + free space. - Currently, vdevs cannot be removed from a zpool, and disks + Currently, vdevs cannot be removed from a pool, and disks can only be removed from a mirror if there is enough remaining redundancy. @@ -585,13 +579,12 @@ errors: No known data errors Checking the Status of a Pool Pool status is important. If a drive goes offline or a - read, write, or checksum error is detected, the error - counter in status is incremented. The - status output shows the configuration and - status of each device in the pool, in addition to the status - of the entire pool. Actions that need to be taken and details - about the last scrub + read, write, or checksum error is detected, the corresponding + error count is incremented. The status + output shows the configuration and status of each device in + the pool, in addition to the status of the entire pool + Actions that need to be taken and details about the last scrub are also shown. &prompt.root; zpool status @@ -619,7 +612,7 @@ errors: No known data errors When an error is detected, the read, write, or checksum counts are incremented. The error message can be cleared and the counts reset with zpool clear - mypool. Clearing the + mypool. Clearing the error state can be important for automated scripts that alert the administrator when the pool encounters an error. Further errors may not be reported if the old errors are not @@ -637,20 +630,20 @@ errors: No known data errors After this operation completes, the old disk is disconnected from the vdev. If the new disk is larger than the old disk, it may be possible to grow the zpool, using the new space. - See Growing a - Pool. + See + Growing a Pool. Dealing with Failed Devices - When a disk in a ZFS pool fails, the - vdev that the disk belongs to will enter the + When a disk in a pool fails, the vdev to which the disk + belongs will enter the Degraded state. In this state, all of the data stored on the vdev is still available, but performance may be impacted because missing - data will need to be calculated from the available redundancy. - To restore the vdev to a fully functional state, the failed + data must be calculated from the available redundancy. To + restore the vdev to a fully functional state, the failed physical device must be replaced, and ZFS must be instructed to begin the resilver operation, @@ -659,23 +652,23 @@ errors: No known data errors device. After the process has completed, the vdev will return to Online status. If the vdev does not have any redundancy, or if multiple devices - have failed and there is not enough redundancy to - compensate, the pool will enter the - Faulted state. If a - sufficient number of devices cannot be reconnected to the pool - then the pool will be inoperative, and data must be + have failed and there is not enough redundancy to compensate, + the pool will enter the + Faulted state. When a + sufficient number of devices cannot be reconnected to the + pool, then the pool will be inoperative, and data must be restored from backups. Scrubbing a Pool - It is recommended that pools be scrubbed regularly, ideally - at least once every month. The scrub - operating is very disk-intensive and will reduce performance - while running. Avoid high-demand periods when scheduling - scrub or use It is recommended that pools be + scrubbed regularly, + ideally at least once every month. The + scrub operation is very disk-intensive and + will reduce performance while running. Avoid high-demand + periods when scheduling scrub or use vfs.zfs.scrub_delay to adjust the relative priority of the scrub to prevent it interfering with other @@ -717,23 +710,21 @@ errors: No known data errors pool. For example, a mirror with two disks where one drive is starting to malfunction and cannot properly store the data any more. This is even worse when the data has not been accessed - for a long time in long term archive storage for example. + for a long time, as with long term archive storage. Traditional file systems need to run algorithms that check and - repair the data like the &man.fsck.8; program. These commands - take time and in severe cases, an administrator has to - manually decide which repair operation has to be performed. - When ZFS detects that a data block is being - read whose checksum does not match, it will try to read the - data from the mirror disk. If that disk can provide the - correct data, it will not only give that data to the - application requesting it, but also correct the wrong data on - the disk that had the bad checksum. This happens without any - interaction of a system administrator during normal pool - operation. - - The next example will demonstrate this self-healing - behavior in ZFS. First, a mirrored pool of - two disks /dev/ada0 and + repair the data like &man.fsck.8;. These commands take time, + and in severe cases, an administrator has to manually decide + which repair operation must be performed. When + ZFS detects a data block with a checksum + that does not match, it tries to read the data from the mirror + disk. If that disk can provide the correct data, it will not + only give that data to the application requesting it, but also + correct the wrong data on the disk that had the bad checksum. + This happens without any interaction from a system + administrator during normal pool operation. + + The next example demonstrates this self-healing behavior. + A mirrored pool of disks /dev/ada0 and /dev/ada1 is created. &prompt.root; zpool create healer mirror /dev/ada0 /dev/ada1 @@ -754,10 +745,9 @@ errors: No known data errors NAME SIZE ALLOC FREE CAP DEDUP HEALTH ALTROOT healer 960M 92.5K 960M 0% 1.00x ONLINE - - Now, some important data that we want to protect from data - errors using the self-healing feature is copied to the pool. - A checksum of the pool is then created to compare it against - the pool later on. + Some important data that to be protected from data errors + using the self-healing feature is copied to the pool. A + checksum of the pool is created for later comparison. &prompt.root; cp /some/important/data /healer &prompt.root; zfs list @@ -767,22 +757,22 @@ healer 960M 67.7M 892M 7% 1.00 &prompt.root; cat checksum.txt SHA1 (/healer) = 2753eff56d77d9a536ece6694bf0a82740344d1f - Next, data corruption is simulated by writing random data - to the beginning of one of the disks that make up the mirror. - To prevent ZFS from healing the data as - soon as it detects it, we export the pool first and import it - again afterwards. + Data corruption is simulated by writing random data to the + beginning of one of the disks in the mirror. To prevent + ZFS from healing the data as soon as it is + detected, the pool is exported before the corruption and + imported again afterwards. This is a dangerous operation that can destroy vital data. It is shown here for demonstrational purposes only and should not be attempted during normal operation of a - ZFS storage pool. Nor should this - dd example be run on a disk with a - different filesystem on it. Do not use any other disk - device names other than the ones that are part of the - ZFS pool. Make sure that proper backups - of the pool are created before running the command! + storage pool. Nor should this intentional corruption + example be run on any disk with a different file system on + it. Do not use any other disk device names other than the + ones that are part of the pool. Make certain that proper + backups of the pool are created before running the + command! &prompt.root; zpool export healer @@ -792,15 +782,13 @@ SHA1 (/healer) = 2753eff56d77d9a536ece66 209715200 bytes transferred in 62.992162 secs (3329227 bytes/sec) &prompt.root; zpool import healer - The ZFS pool status shows that one - device has experienced an error. It is important to know that - applications reading data from the pool did not receive any - data with a wrong checksum. ZFS did - provide the application with the data from the - ada0 device that has the correct - checksums. The device with the wrong checksum can be found - easily as the CKSUM column contains a value - greater than zero. + The pool status shows that one device has experienced an + error. Note that applications reading data from the pool did + not receive any incorrect data. ZFS + provided data from the ada0 device with + the correct checksums. The device with the wrong checksum can + be found easily as the CKSUM column + contains a nonzero value. &prompt.root; zpool status healer pool: healer @@ -821,11 +809,10 @@ SHA1 (/healer) = 2753eff56d77d9a536ece66 errors: No known data errors - ZFS has detected the error and took - care of it by using the redundancy present in the unaffected - ada0 mirror disk. A checksum comparison - with the original one will reveal whether the pool is - consistent again. + The error was detected and handled by using the redundancy + present in the unaffected ada0 mirror + disk. A checksum comparison with the original one will reveal + whether the pool is consistent again. &prompt.root; sha1 /healer >> checksum.txt &prompt.root; cat checksum.txt @@ -835,17 +822,17 @@ SHA1 (/healer) = 2753eff56d77d9a536ece66 The two checksums that were generated before and after the intentional tampering with the pool data still match. This shows how ZFS is capable of detecting and - correcting any errors automatically when the checksums do not - match any more. Note that this is only possible when there is - enough redundancy present in the pool. A pool consisting of a - single device has no self-healing capabilities. That is also - the reason why checksums are so important in + correcting any errors automatically when the checksums differ. + Note that this is only possible when there is enough + redundancy present in the pool. A pool consisting of a single + device has no self-healing capabilities. That is also the + reason why checksums are so important in ZFS and should not be disabled for any reason. No &man.fsck.8; or similar filesystem consistency check program is required to detect and correct this and the - pool was available the whole time. A scrub operation is now - required to remove the falsely written data from - ada1. + pool was still available during the time there was a problem. + A scrub operation is now required to overwrite the corrupted + data on ada1. &prompt.root; zpool scrub healer &prompt.root; zpool status healer @@ -869,12 +856,12 @@ config: errors: No known data errors - The scrub operation is reading the data from - ada0 and corrects all data that has a - wrong checksum on ada1. This is + The scrub operation reads data from + ada0 and rewrites any data with an + incorrect checksum on ada1. This is indicated by the (repairing) output from zpool status. After the operation is - complete, the pool status has changed to: + complete, the pool status changes to: &prompt.root; zpool status healer pool: healer @@ -895,12 +882,11 @@ config: errors: No known data errors - After the scrub operation has completed and all the data + After the scrub operation completes and all the data has been synchronized from ada0 to - ada1, the error messages can be cleared - from the pool status by running zpool - clear. + ada1, the error messages can be + cleared from the pool + status by running zpool clear. &prompt.root; zpool clear healer &prompt.root; zpool status healer @@ -917,47 +903,46 @@ config: errors: No known data errors - Our pool is now back to a fully working state and all the + The pool is now back to a fully working state and all the errors have been cleared. Growing a Pool - The usable size of a redundant ZFS pool - is limited by the size of the smallest device in the vdev. If - each device in the vdev is replaced sequentially, after the - smallest device has completed the - replace or - resilver operation, - the pool can grow based on the size of the new smallest - device. This expansion can be triggered by using - zpool online with - on each device. After expansion of all devices, - the additional space will become available to the pool. + The usable size of a redundant pool is limited by the size + of the smallest device in the vdev. If each device in the + vdev is replaced sequentially, after the smallest device has + completed the replace + or resilver + operation, the pool can grow based on the size of the new + smallest device. This expansion is triggered by using + zpool online with on + each device. After expansion of all devices, the additional + space becomes available to the pool. - Importing & Exporting Pools + Importing and Exporting Pools - Pools can be exported in preparation for moving them to - another system. All datasets are unmounted, and each device - is marked as exported but still locked so it cannot be used - by other disk subsystems. This allows pools to be imported on - other machines, other operating systems that support - ZFS, and even different hardware - architectures (with some caveats, see &man.zpool.8;). When a - dataset has open files, can be used to - force the export of a pool. causes the - datasets to be forcibly unmounted, which can cause undefined - behavior in the applications which had open files on those - datasets. + Pools are exported before moving them + to another system. All datasets are unmounted, and each + device is marked as exported but still locked so it cannot be + used by other disk subsystems. This allows pools to be + imported on other machines, other + operating systems that support ZFS, and + even different hardware architectures (with some caveats, see + &man.zpool.8;). When a dataset has open files, + can be used to force the export of a pool. + Use this with caution. The datasets are forcibly unmounted, + potentially resulting in unexpected behavior by the + applications which had open files on those datasets. Importing a pool automatically mounts the datasets. This may not be the desired behavior, and can be prevented with . sets temporary properties for this import only. - allows importing a zpool with a base mount point instead of + allows importing a pool with a base mount point instead of the root of the file system. If the pool was last used on a different system and was not properly exported, an import might have to be forced with . @@ -971,9 +956,11 @@ errors: No known data errors After upgrading &os;, or if a pool has been imported from a system using an older version of ZFS, the pool can be manually upgraded to the latest version of - ZFS. Consider whether the pool may ever - need to be imported on an older system before upgrading. The - upgrade process is unreversible and cannot be undone. + ZFS to support newer features. Consider + whether the pool may ever need to be imported on an older + system before upgrading. Upgrading is a one-way process. + Older pools can be upgraded, but pools with newer features + cannot be downgraded. &prompt.root; zpool status pool: mypool @@ -1001,8 +988,8 @@ errors: No known data errors features are already supported. - Systems that boot from a pool must have their boot code - updated to support the new pool version. Run + The boot code on systems that boot from a pool must be + updated to support the new pool version. Use gpart bootcode on the partition that contains the boot code. See &man.gpart.8; for more information. @@ -1012,15 +999,13 @@ errors: No known data errors Displaying Recorded Pool History - ZFS records all the commands that were - issued to administer the pool. These include the creation of - datasets, changing properties, or when a disk has been - replaced in the pool. This history is useful for reviewing - how a pool was created and which user did a specific action - and when. History is not kept in a log file, but is part of - the pool itself. Because of that, history cannot be altered - after the fact unless the pool is destroyed. The command to - review this history is aptly named + Commands that modify the pool are recorded. Recorded + actions include the creation of datasets, changing properties, + or replacement of a disk. This history is useful for + reviewing how a pool was created and which user performed a + specific action and when. History is not kept in a log file, + but is part of the pool itself. The command to review this + history is aptly named zpool history: &prompt.root; zpool history @@ -1032,18 +1017,17 @@ History for 'tank': The output shows zpool and zfs commands that were executed on the pool - along with a timestamp. Only commands that alter - the pool in some way are recorded. Commands like - zfs list are not included. When - no pool name is given to - zpool history, the history of all - pools is displayed. + along with a timestamp. Only commands that alter the pool in + some way are recorded. Commands like + zfs list are not included. When no pool + name is specified, the history of all pools is + displayed. zpool history can show even more information when the options or - are provided. The option - displays user initiated events as well - as internally logged ZFS events. + are provided. + displays user-initiated events as well as internally logged + ZFS events. &prompt.root; zpool history -i History for 'tank': @@ -1056,9 +1040,9 @@ History for 'tank': 2013-02-27.18:51:18 zfs create tank/backup More details can be shown by adding . - History records are shown in a long format, - including information like the name of the user who issued the - command and the hostname on which the change was made. + History records are shown in a long format, including + information like the name of the user who issued the command + and the hostname on which the change was made. &prompt.root; zpool history -l History for 'tank': @@ -1067,36 +1051,36 @@ History for 'tank': 2013-02-27.18:51:09 zfs set checksum=fletcher4 tank [user 0 (root) on myzfsbox:global] 2013-02-27.18:51:18 zfs create tank/backup [user 0 (root) on myzfsbox:global] - This output clearly shows that the root user created the mirrored - pool (consisting of /dev/ada0 and - /dev/ada1). In addition to that, the - hostname (myzfsbox) is also shown in the - commands after the pool's creation. The hostname display - becomes important when the pool is exported from the current - and imported on another system. The commands that are issued + The output shows that the + root user created + the mirrored pool with disks + /dev/ada0 and + /dev/ada1. The hostname + myzfsbox is also + shown in the commands after the pool's creation. The hostname + display becomes important when the pool is exported from one + system and imported on another. The commands that are issued on the other system can clearly be distinguished by the hostname that is recorded for each command. Both options to zpool history can be combined to give the most detailed information possible for any given pool. Pool history provides valuable information - when tracking down what actions were performed or when more - detailed output is needed for debugging. + when tracking down the actions that were performed or when + more detailed output is needed for debugging. Performance Monitoring - A built-in monitoring system can display - statistics about I/O on the pool in real-time. It - shows the amount of free and used space on the pool, how many - read and write operations are being performed per second, and - how much I/O bandwidth is currently being utilized. - By default, all pools in the system - are monitored and displayed. A pool name can be provided - to limit monitoring to just that pool. A - basic example: + A built-in monitoring system can display pool + I/O statistics in real time. It shows the + amount of free and used space on the pool, how many read and + write operations are being performed per second, and how much + I/O bandwidth is currently being utilized. + By default, all pools in the system are monitored and + displayed. A pool name can be provided to limit monitoring to + just that pool. A basic example: &prompt.root; zpool iostat capacity operations bandwidth @@ -1104,10 +1088,10 @@ pool alloc free read write ---------- ----- ----- ----- ----- ----- ----- data 288G 1.53T 2 11 11.3K 57.1K - To continuously monitor I/O activity on the pool, a - number can be specified as the last parameter, indicating - the frequency in seconds to wait between updates. - The next statistic line is printed after each interval. Press + To continuously monitor I/O activity, a + number can be specified as the last parameter, indicating a + interval in seconds to wait between updates. The next + statistic line is printed after each interval. Press Ctrl C @@ -1116,14 +1100,13 @@ data 288G 1.53T 2 11 the interval to specify the total number of statistics to display. - Even more detailed pool I/O statistics can be displayed - with . Each device in - the pool is shown with a statistics line. - This is useful in seeing how many read and write - operations are being performed on each device, and can help - determine if any individual device is slowing down the - pool. This example shows a mirrored pool - consisting of two devices: + Even more detailed I/O statistics can + be displayed with . Each device in the + pool is shown with a statistics line. This is useful in + seeing how many read and write operations are being performed + on each device, and can help determine if any individual + device is slowing down the pool. This example shows a + mirrored pool with two devices: &prompt.root; zpool iostat -v capacity operations bandwidth @@ -1139,14 +1122,14 @@ data 288G 1.53T Splitting a Storage Pool - A pool consisting of one or more mirror vdevs can be - split into a second pool. The last member of each mirror - (unless otherwise specified) is detached and used to create a - new pool containing the same data. It is recommended that the - operation first be attempted with the - parameter. The details of the proposed operation are - displayed without actually performing it. This helps ensure - the operation will happen as expected. + A pool consisting of one or more mirror vdevs can be split + into two pools. Unless otherwise specified, the last member + of each mirror is detached and used to create a new pool *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Tue Jun 3 22:29:10 2014 Return-Path: Delivered-To: svn-doc-projects@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 A485A766; Tue, 3 Jun 2014 22:29:10 +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 8B9F32260; Tue, 3 Jun 2014 22:29:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53MTAgY027219; Tue, 3 Jun 2014 22:29:10 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53MTAKL027218; Tue, 3 Jun 2014 22:29:10 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201406032229.s53MTAKL027218@svn.freebsd.org> From: Warren Block Date: Tue, 3 Jun 2014 22:29:10 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r45002 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2014 22:29:10 -0000 Author: wblock Date: Tue Jun 3 22:29:10 2014 New Revision: 45002 URL: http://svnweb.freebsd.org/changeset/doc/45002 Log: Latest edits for clarity and consistency. Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Tue Jun 3 21:18:23 2014 (r45001) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Tue Jun 3 22:29:10 2014 (r45002) @@ -48,8 +48,8 @@ overcome many of the major problems found in previous designs. - Originally developed at &sun;, ongoing ZFS - development has moved to the Originally developed at &sun;, ongoing open source + ZFS development has moved to the OpenZFS Project. ZFS has three major design goals: @@ -116,8 +116,8 @@ pool. This new space is then made available to all of the file systems. ZFS also has a number of different properties that can be applied to each file system, giving many - advantages to creating a number of different filesystems and - datasets rather than a single monolithic filesystem. + advantages to creating a number of different file systems and + datasets rather than a single monolithic file system. @@ -227,7 +227,7 @@ example on /example (zfs, local) example/data on /example/data (zfs, local) example/compressed on /example/compressed (zfs, local) - After creatopm, ZFS datasets can be + After creation, ZFS datasets can be used like any file systems. However, many other features are available which can be set on a per-dataset basis. In the example below, a new file system called @@ -516,7 +516,7 @@ errors: No known data errors replacing, and managing disks. The zfs utility deals with creating, destroying, and managing datasets, - both filesystems and + both file systems and volumes. @@ -534,10 +534,85 @@ errors: No known data errors the vdev. The exceptions are mirrors, which allow additional disks to be added to the vdev, and stripes, which can be upgraded to mirrors by attaching an additional disk to the - vdev. Although additional vdevs can be added to a pool, the - layout of the pool cannot be changed once the pool has been - created. Instead the data must be backed up and the pool - destroyed and recreated. + vdev. Although additional vdevs can be added to expand a + pool, the layout of the pool cannot be changed after pool + creation. Instead, the data must be backed up and the + pool destroyed and recreated. + + Create a simple mirror pool: + + &prompt.root; zpool create mypool mirror /dev/ada1 /dev/ada2 +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada1 ONLINE 0 0 0 + ada2 ONLINE 0 0 0 + +errors: No known data errors + + Multiple vdevs can be created at once. Specify multiple + groups of disks separated by the vdev type keyword, + mirror in this example: + + &prompt.root; zpool create mypool mirror /dev/ada1 /dev/ada2 mirror /dev/ada3 /dev/ada4 + pool: mypool + state: ONLINE + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada1 ONLINE 0 0 0 + ada2 ONLINE 0 0 0 + mirror-1 ONLINE 0 0 0 + ada3 ONLINE 0 0 0 + ada4 ONLINE 0 0 0 + +errors: No known data errors + + Pools can also be constructed using partitions rather than + whole disks. Putting ZFS in a separate partition allows the + same disk to have other partitions for other purposes. In + particular, partitions with bootcode and file systems needed + for booting can be added. This allows booting from disks that + are also members of a pool. There is no performance penalty + on &os; when using a partition rather than a whole disk. + Using partitions also allows the administrator to + under-provision the disks, using less + than the full capacity. If a future replacement disk of the + same nominal size as the original actually has a slightly + smaller capacity, the smaller partition will still fit, and + the replacement disk can still be used. + + Create a + RAID-Z2 pool using + partitions: + + &prompt.root; zpool create mypool raidz2 /dev/ada0p3 /dev/ada1p3 /dev/ada2p3 /dev/ada3p3 /dev/ada4p3 /dev/ada5p3 +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + raidz2-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + ada2p3 ONLINE 0 0 0 + ada3p3 ONLINE 0 0 0 + ada4p3 ONLINE 0 0 0 + ada5p3 ONLINE 0 0 0 + +errors: No known data errors A pool that is no longer needed can be destroyed so that the disks can be reused. Destroying a pool involves first @@ -559,20 +634,183 @@ errors: No known data errors vdev types allow disks to be added to the vdev after creation. + A pool created with a single disk lacks redundancy. + Corruption can be detected but + not repaired, because there is no other copy of the data. + + The copies property may + be able to recover from a small failure such as a bad sector, + but does not provide the same level of protection as mirroring + or RAID-Z. Starting with a pool consisting + of a single disk vdev, zpool attach can be + used to add an additional disk to the vdev, creating a mirror. + zpool attach can also be used to add + additional disks to a mirror group, increasing redundancy and + read performance. If the disks being used for the pool are + partitioned, replicate the layout of the first disk on to the + second, gpart backup and + gpart restore can be used to make this + process easier. + + Upgrade the single disk (stripe) vdev + ada0p3 to a mirror by attaching + ada1p3: + + &prompt.root; zpool status + pool: mypool + state: ONLINE + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + +errors: No known data errors +&prompt.root; zpool attach mypool ada0p3 ada1p3 +Make sure to wait until resilver is done before rebooting. + +If you boot from pool 'mypool', you may need to update +boot code on newly attached disk 'ada1p3'. + +Assuming you use GPT partitioning and 'da0' is your new boot disk +you may use the following command: + + gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 da0 +&prompt.root; gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada1 +bootcode written to ada1 +&prompt.root; zpool status + pool: mypool + state: ONLINE +status: One or more devices is currently being resilvered. The pool will + continue to function, possibly in a degraded state. +action: Wait for the resilver to complete. + scan: resilver in progress since Fri May 30 08:19:19 2014 + 527M scanned out of 781M at 47.9M/s, 0h0m to go + 527M resilvered, 67.53% done +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 (resilvering) + +errors: No known data errors +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: resilvered 781M in 0h0m with 0 errors on Fri May 30 08:15:58 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + +errors: No known data errors + When adding disks to the existing vdev is not an option, - as for RAID-Z, the other option is to add a vdev to the pool. - It is possible, but discouraged, to mix vdev types. - ZFS stripes data across each of the vdevs. - For example, if there are two mirror vdevs, then this is - effectively a RAID 10, striping the writes - across the two sets of mirrors. Space is allocated so that - each vdev reaches 100% full at the same time, so there is a - performance penalty if the vdevs have different amounts of - free space. + as for RAID-Z, an alternative method is to + add another vdev to the pool. Additional vdevs provide higher + performance, distributing writes across the vdevs. Each vdev + is reponsible for providing its own redundancy. It is + possible, but discouraged, to mix vdev types, like + mirror and RAID-Z. + Adding a non-redundant vdev to a pool containing mirror or + RAID-Z vdevs risks the data on the entire + pool. Writes are distributed, so the failure of the + non-redundant disk will result in the loss of a fraction of + every block that has been writen to the pool. + + Data is striped across each of the vdevs. For example, + with two mirror vdevs, this is effectively a + RAID 10 that stripes writes across two sets + of mirrors. Space is allocated so that each vdev reaches 100% + full at the same time. There is a performance penalty if the + vdevs have different amounts of free space, as a + disproportionate amount of the data is written to the less + full vdev. + + When attaching additional devices to a boot pool, remember + to update the bootcode. + + Attach a second mirror group (ada2p3 + and ada3p3) to the existing + mirror: + + &prompt.root; zpool status + pool: mypool + state: ONLINE + scan: resilvered 781M in 0h0m with 0 errors on Fri May 30 08:19:35 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + +errors: No known data errors +&prompt.root; zpool add mypool mirror ada2p3 ada3p3 +&prompt.root; gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada2 +bootcode written to ada2 +&prompt.root; gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada3 +bootcode written to ada3 +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: scrub repaired 0 in 0h0m with 0 errors on Fri May 30 08:29:51 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + mirror-1 ONLINE 0 0 0 + ada2p3 ONLINE 0 0 0 + ada3p3 ONLINE 0 0 0 + +errors: No known data errors Currently, vdevs cannot be removed from a pool, and disks can only be removed from a mirror if there is enough remaining - redundancy. + redundancy. If only one disk in a mirror group remains, it + ceases to be a mirror and reverts to being a stripe, risking + the entire pool if that remaining disk fails. + + Remove a disk from a three-way mirror group: + + &prompt.root; zpool status + pool: mypool + state: ONLINE + scan: scrub repaired 0 in 0h0m with 0 errors on Fri May 30 08:29:51 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + ada2p3 ONLINE 0 0 0 + +errors: No known data errors +&prompt.root; zpool detach mypool ada2p3 +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: scrub repaired 0 in 0h0m with 0 errors on Fri May 30 08:29:51 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + +errors: No known data errors @@ -580,10 +818,10 @@ errors: No known data errors Pool status is important. If a drive goes offline or a read, write, or checksum error is detected, the corresponding - error count is incremented. The status - output shows the configuration and status of each device in - the pool, in addition to the status of the entire pool - Actions that need to be taken and details about the last status output + shows the configuration and status of each device in the pool + and the status of the entire pool. Actions that need to be + taken and details about the last scrub are also shown. @@ -622,42 +860,165 @@ errors: No known data errors Replacing a Functioning Device - There are a number of situations in which it may be - desirable to replace a disk with a different disk. This - process requires connecting the new disk at the same time as - the disk to be replaced. zpool replace - will copy all of the data from the old disk to the new one. - After this operation completes, the old disk is disconnected - from the vdev. If the new disk is larger than the old disk, - it may be possible to grow the zpool, using the new space. - See - Growing a Pool. + There are a number of situations where it m be + desirable to replace one disk with a different disk. When + replacing a working disk, the process keeps the old disk + online during the replacement. The pool never enters a + degraded state, + reducing the risk of data loss. + zpool replace copies all of the data from + the old disk to the new one. After the operation completes, + the old disk is disconnected from the vdev. If the new disk + is larger than the old disk, it may be possible to grow the + zpool, using the new space. See Growing a Pool. + + Replace a functioning device in the pool: + + &prompt.root; zpool status + pool: mypool + state: ONLINE + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + +errors: No known data errors +&prompt.root; zpool replace mypool ada1p3 ada2p3 +Make sure to wait until resilver is done before rebooting. + +If you boot from pool 'zroot', you may need to update +boot code on newly attached disk 'ada2p3'. + +Assuming you use GPT partitioning and 'da0' is your new boot disk +you may use the following command: + + gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 da0 +&prompt.root; gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 ada2 +&prompt.root; zpool status + pool: mypool + state: ONLINE +status: One or more devices is currently being resilvered. The pool will + continue to function, possibly in a degraded state. +action: Wait for the resilver to complete. + scan: resilver in progress since Mon Jun 2 14:21:35 2014 + 604M scanned out of 781M at 46.5M/s, 0h0m to go + 604M resilvered, 77.39% done +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + replacing-1 ONLINE 0 0 0 + ada1p3 ONLINE 0 0 0 + ada2p3 ONLINE 0 0 0 (resilvering) + +errors: No known data errors +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: resilvered 781M in 0h0m with 0 errors on Mon Jun 2 14:21:52 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada2p3 ONLINE 0 0 0 + +errors: No known data errors Dealing with Failed Devices When a disk in a pool fails, the vdev to which the disk - belongs will enter the - Degraded state. In - this state, all of the data stored on the vdev is still - available, but performance may be impacted because missing - data must be calculated from the available redundancy. To - restore the vdev to a fully functional state, the failed - physical device must be replaced, and ZFS - must be instructed to begin the - resilver operation, - where data that was on the failed device will be recalculated - from available redundancy and written to the replacement - device. After the process has completed, the vdev will return - to Online status. If - the vdev does not have any redundancy, or if multiple devices - have failed and there is not enough redundancy to compensate, - the pool will enter the - Faulted state. When a + belongs enters the + degraded state. All + of the data is still available, but performance may be reduced + because missing data must be calculated from the available + redundancy. To restore the vdev to a fully functional state, + the failed physical device must be replaced. + ZFS is then instructed to begin the + resilver operation. + Data that was on the failed device is recalculated from + available redundancy and written to the replacement device. + After completion, the vdev returns to + online status. + + If the vdev does not have any redundancy, or if multiple + devices have failed and there is not enough redundancy to + compensate, the pool enters the + faulted state. If a sufficient number of devices cannot be reconnected to the - pool, then the pool will be inoperative, and data must be - restored from backups. + pool, the pool becomes inoperative and data must be restored + from backups. + + When replacing a failed disk, the name of the failed disk + is replaced with the GUID of the device. + A new device name parameter for + zpool replace is not required if the + replacement device has the same device name. + + Replace a failed disk using + zpool replace: + + &prompt.root; zpool status + pool: mypool + state: DEGRADED +status: One or more devices could not be opened. Sufficient replicas exist for + the pool to continue functioning in a degraded state. +action: Attach the missing device and online it using 'zpool online'. + see: http://illumos.org/msg/ZFS-8000-2Q + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool DEGRADED 0 0 0 + mirror-0 DEGRADED 0 0 0 + ada0p3 ONLINE 0 0 0 + 316502962686821739 UNAVAIL 0 0 0 was /dev/ada1p3 + +errors: No known data errors +&prompt.root; zpool replace mypool 316502962686821739 ada2p3 +&prompt.root; zpool status + pool: mypool + state: DEGRADED +status: One or more devices is currently being resilvered. The pool will + continue to function, possibly in a degraded state. +action: Wait for the resilver to complete. + scan: resilver in progress since Mon Jun 2 14:52:21 2014 + 641M scanned out of 781M at 49.3M/s, 0h0m to go + 640M resilvered, 82.04% done +config: + + NAME STATE READ WRITE CKSUM + mypool DEGRADED 0 0 0 + mirror-0 DEGRADED 0 0 0 + ada0p3 ONLINE 0 0 0 + replacing-1 UNAVAIL 0 0 0 + 15732067398082357289 UNAVAIL 0 0 0 was /dev/ada1p3/old + ada2p3 ONLINE 0 0 0 (resilvering) + +errors: No known data errors +&prompt.root; zpool status + pool: mypool + state: ONLINE + scan: resilvered 781M in 0h0m with 0 errors on Mon Jun 2 14:52:38 2014 +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0p3 ONLINE 0 0 0 + ada2p3 ONLINE 0 0 0 + +errors: No known data errors @@ -828,7 +1189,7 @@ SHA1 (/healer) = 2753eff56d77d9a536ece66 device has no self-healing capabilities. That is also the reason why checksums are so important in ZFS and should not be disabled for any - reason. No &man.fsck.8; or similar filesystem consistency + reason. No &man.fsck.8; or similar file system consistency check program is required to detect and correct this and the pool was still available during the time there was a problem. A scrub operation is now required to overwrite the corrupted @@ -910,13 +1271,20 @@ errors: No known data errors Growing a Pool - The usable size of a redundant pool is limited by the size - of the smallest device in the vdev. If each device in the - vdev is replaced sequentially, after the smallest device has - completed the replace - or resilver - operation, the pool can grow based on the size of the new - smallest device. This expansion is triggered by using + The usable size of a redundant pool is limited by the + capacity of the smallest device in each vdev. The smallest + device can be replaced with a larger device. After completing + a replace or + resilver operation, + the pool can grow to use the capacity of the new device. For + example, consider a mirror of a 1 TB drive and a + 2 drive. The usable space is 1 . Then the + 1 TB is replaced with another 2 TB drive, and the + resilvering process duplicates existing data. Because + both of the devices now have 2 TB capacity, the mirror's + available space can be grown to 2 TB. + + Expansion is triggered by using zpool online with on each device. After expansion of all devices, the additional space becomes available to the pool. @@ -938,6 +1306,10 @@ errors: No known data errors potentially resulting in unexpected behavior by the applications which had open files on those datasets. + Export a pool that is not in use: + + &prompt.root; zpool export mypool + Importing a pool automatically mounts the datasets. This may not be the desired behavior, and can be prevented with . sets temporary @@ -948,6 +1320,26 @@ errors: No known data errors might have to be forced with . imports all pools that do not appear to be in use by another system. + + List all available pools for import: + + &prompt.root; zpool import + pool: mypool + id: 9930174748043525076 + state: ONLINE + action: The pool can be imported using its name or numeric identifier. + config: + + mypool ONLINE + ada2p3 ONLINE + + Import the pool with an alternative root directory: + + &prompt.root; zpool import -o altroot=/mnt mypool +&prompt.root; zfs list +zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 110K 47.0G 31K /mnt/mypool @@ -962,6 +1354,9 @@ errors: No known data errors Older pools can be upgraded, but pools with newer features cannot be downgraded. + Upgrade a v28 pool to support + Feature Flags: + &prompt.root; zpool status pool: mypool state: ONLINE @@ -979,7 +1374,30 @@ config: ada0 ONLINE 0 0 0 ada1 ONLINE 0 0 0 -errors: No known data errors +errors: No known data errors +&prompt.root; zpool upgrade +This system supports ZFS pool feature flags. + +The following pools are formatted with legacy version numbers and can +be upgraded to use feature flags. After being upgraded, these pools +will no longer be accessible by software that does not support feature +flags. + +VER POOL +--- ------------ +28 mypool + +Use 'zpool upgrade -v' for a list of available legacy versions. +Every feature flags pool has all supported features enabled. +&prompt.root; zpool upgrade mypool +This system supports ZFS pool feature flags. + +Successfully upgraded 'mypool' from version 28 to feature flags. +Enabled the following features on 'mypool': + async_destroy + empty_bpobj + lz4_compress + multi_vdev_crash_dump The newer features of ZFS will not be available until zpool upgrade has @@ -987,6 +1405,57 @@ errors: No known data errors features will be provided by upgrading, as well as which features are already supported. + Upgrade a pool to support additional feature flags: + + &prompt.root; zpool status + pool: mypool + state: ONLINE +status: Some supported features are not enabled on the pool. The pool can + still be used, but some features are unavailable. +action: Enable all features using 'zpool upgrade'. Once this is done, + the pool may no longer be accessible by software that does not support + the features. See zpool-features(7) for details. + scan: none requested +config: + + NAME STATE READ WRITE CKSUM + mypool ONLINE 0 0 0 + mirror-0 ONLINE 0 0 0 + ada0 ONLINE 0 0 0 + ada1 ONLINE 0 0 0 + +errors: No known data errors +&prompt.root; zpool upgrade +This system supports ZFS pool feature flags. + +All pools are formatted using feature flags. + + +Some supported features are not enabled on the following pools. Once a +feature is enabled the pool may become incompatible with software +that does not support the feature. See zpool-features(7) for details. + +POOL FEATURE +--------------- +zstore + multi_vdev_crash_dump + spacemap_histogram + enabled_txg + hole_birth + extensible_dataset + bookmarks + filesystem_limits +&prompt.root; zpool upgrade mypool +This system supports ZFS pool feature flags. + +Enabled the following features on 'mypool': + spacemap_histogram + enabled_txg + hole_birth + extensible_dataset + bookmarks + filesystem_limits + The boot code on systems that boot from a pool must be updated to support the new pool version. Use @@ -1129,7 +1598,7 @@ data 288G 1.53T attempted with . The details of the proposed operation are displayed without it actually being performed. This helps confirm that the operation will do what - the user expects. + the user intends. @@ -1146,19 +1615,22 @@ data 288G 1.53T Creating and Destroying Datasets Unlike traditional disks and volume managers, space in - ZFS is not preallocated. With traditional - file systems, after all of the space was partitioned and - assigned, there was no way to add an additional file system - without adding a new disk. With ZFS, new - file systems can be created at any time. Each ZFS is not + preallocated. With traditional file systems, after all of the + space is partitioned and assigned, there is no way to add an + additional file system without adding a new disk. With + ZFS, new file systems can be created at any + time. Each dataset has properties including features like compression, - deduplication, caching and quoteas, as well as other useful + deduplication, caching, and quotas, as well as other useful properties like readonly, case sensitivity, network file - sharing, and a mount point. Each separate dataset can be - administered, delegated, + sharing, and a mount point. Datasets can be nested inside + each other, and child datasets will inherit properties from + their parents. Each dataset can be administered, + delegated, replicated, - snapshoted, + snapshotted, jailed, and destroyed as a unit. There are many advantages to creating a separate dataset for each different type or set of files. The only @@ -1167,10 +1639,84 @@ data 288G 1.53T slower, and the mounting of hundreds or even thousands of datasets can slow the &os; boot process. + Create a new dataset and enable LZ4 + compression on it: + + &prompt.root; zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 781M 93.2G 144K none +mypool/ROOT 777M 93.2G 144K none +mypool/ROOT/default 777M 93.2G 777M / +mypool/tmp 176K 93.2G 176K /tmp +mypool/usr 616K 93.2G 144K /usr +mypool/usr/home 184K 93.2G 184K /usr/home +mypool/usr/ports 144K 93.2G 144K /usr/ports +mypool/usr/src 144K 93.2G 144K /usr/src +mypool/var 1.20M 93.2G 608K /var +mypool/var/crash 148K 93.2G 148K /var/crash +mypool/var/log 178K 93.2G 178K /var/log +mypool/var/mail 144K 93.2G 144K /var/mail +mypool/var/tmp 152K 93.2G 152K /var/tmp +&prompt.root; zfs create -o compress=lz4 mypool/usr/mydataset +&prompt.root; zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 781M 93.2G 144K none +mypool/ROOT 777M 93.2G 144K none +mypool/ROOT/default 777M 93.2G 777M / +mypool/tmp 176K 93.2G 176K /tmp +mypool/usr 704K 93.2G 144K /usr +mypool/usr/home 184K 93.2G 184K /usr/home +mypool/usr/mydataset 87.5K 93.2G 87.5K /usr/mydataset +mypool/usr/ports 144K 93.2G 144K /usr/ports +mypool/usr/src 144K 93.2G 144K /usr/src +mypool/var 1.20M 93.2G 610K /var +mypool/var/crash 148K 93.2G 148K /var/crash +mypool/var/log 178K 93.2G 178K /var/log +mypool/var/mail 144K 93.2G 144K /var/mail +mypool/var/tmp 152K 93.2G 152K /var/tmp + Destroying a dataset is much quicker than deleting all of the files that reside on the dataset, as it does not involve scanning all of the files and updating all of the - corresponding metadata. In modern versions of + corresponding metadata. + + Destroy the previously-created dataset: + + &prompt.root; zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 880M 93.1G 144K none +mypool/ROOT 777M 93.1G 144K none +mypool/ROOT/default 777M 93.1G 777M / +mypool/tmp 176K 93.1G 176K /tmp +mypool/usr 101M 93.1G 144K /usr +mypool/usr/home 184K 93.1G 184K /usr/home +mypool/usr/mydataset 100M 93.1G 100M /usr/mydataset +mypool/usr/ports 144K 93.1G 144K /usr/ports +mypool/usr/src 144K 93.1G 144K /usr/src +mypool/var 1.20M 93.1G 610K /var +mypool/var/crash 148K 93.1G 148K /var/crash +mypool/var/log 178K 93.1G 178K /var/log +mypool/var/mail 144K 93.1G 144K /var/mail +mypool/var/tmp 152K 93.1G 152K /var/tmp +&prompt.root; zfs destroy mypool/usr/mydataset +&prompt.root; zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 781M 93.2G 144K none +mypool/ROOT 777M 93.2G 144K none +mypool/ROOT/default 777M 93.2G 777M / +mypool/tmp 176K 93.2G 176K /tmp +mypool/usr 616K 93.2G 144K /usr +mypool/usr/home 184K 93.2G 184K /usr/home +mypool/usr/ports 144K 93.2G 144K /usr/ports +mypool/usr/src 144K 93.2G 144K /usr/src +mypool/var 1.21M 93.2G 612K /var +mypool/var/crash 148K 93.2G 148K /var/crash +mypool/var/log 178K 93.2G 178K /var/log +mypool/var/mail 144K 93.2G 144K /var/mail +mypool/var/tmp 152K 93.2G 152K /var/tmp + + In modern versions of ZFS, zfs destroy is asynchronous, and the free space might take several minutes to appear in the pool. Use @@ -1183,10 +1729,10 @@ data 288G 1.53T datasets, then the parent cannot be destroyed. To destroy a dataset and all of its children, use to recursively destroy the dataset and all of its children. - can be used to list datasets and - snapshots that would be destroyed and, in the case of - snapshots, how much space would be reclaimed by the actual - destruction. + Use to list datasets + and snapshots that would be destroyed by this operation, but + do not actually destroy anything. Space that would be + reclaimed by destruction of snapshots is also shown. @@ -1201,14 +1747,14 @@ data 288G 1.53T protocols like iSCSI or HAST. - A volume can be formatted with any file system. To the - user, it will appear as if they are working with a regular - disk using that specific filesystem and not - ZFS. Putting ordinary file systems on - zvols provides features those file systems would not normally - have. For example, using the compression property on a - 250 MB volume allows creation of a compressed - FAT filesystem. + A volume can be formatted with any file system, or used + without a file system to store raw data. To the user, a + volume appears to be a regular disk. Putting ordinary file + systems on these zvols provides features + that ordinary disks or file systems do not normally have. For + example, using the compression property on a 250 MB + volume allows creation of a compressed FAT + file system. &prompt.root; zfs create -V 250m -o compression=on tank/fat32 &prompt.root; zfs list tank @@ -1241,11 +1787,56 @@ Filesystem Size Used Avail Cap dataset). This behavior can be prevented with . - Snapshots can also be renamed in this way. Due to the + Rename a dataset and move it to be under a different + parent dataset: + + &prompt.root; zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 780M 93.2G 144K none +mypool/ROOT 777M 93.2G 144K none +mypool/ROOT/default 777M 93.2G 777M / +mypool/tmp 176K 93.2G 176K /tmp +mypool/usr 704K 93.2G 144K /usr +mypool/usr/home 184K 93.2G 184K /usr/home +mypool/usr/mydataset 87.5K 93.2G 87.5K /usr/mydataset +mypool/usr/ports 144K 93.2G 144K /usr/ports +mypool/usr/src 144K 93.2G 144K /usr/src +mypool/var 1.21M 93.2G 614K /var +mypool/var/crash 148K 93.2G 148K /var/crash +mypool/var/log 178K 93.2G 178K /var/log +mypool/var/mail 144K 93.2G 144K /var/mail +mypool/var/tmp 152K 93.2G 152K /var/tmp +&prompt.root; zfs rename mypool/usr/mydataset mypool/var/newname +&prompt.root; zfs list +NAME USED AVAIL REFER MOUNTPOINT +mypool 780M 93.2G 144K none +mypool/ROOT 777M 93.2G 144K none +mypool/ROOT/default 777M 93.2G 777M / +mypool/tmp 176K 93.2G 176K /tmp +mypool/usr 616K 93.2G 144K /usr +mypool/usr/home 184K 93.2G 184K /usr/home +mypool/usr/ports 144K 93.2G 144K /usr/ports +mypool/usr/src 144K 93.2G 144K /usr/src +mypool/var 1.29M 93.2G 614K /var +mypool/var/crash 148K 93.2G 148K /var/crash +mypool/var/log 178K 93.2G 178K /var/log +mypool/var/mail 144K 93.2G 144K /var/mail +mypool/var/newname 87.5K 93.2G 87.5K /var/newname +mypool/var/tmp 152K 93.2G 152K /var/tmp + + Snapshots can also be renamed like this. Due to the nature of snapshots, they cannot be renamed into a different parent dataset. To rename a recursive snapshot, specify , and all snapshots with the same name in child datasets with also be renamed. + + &prompt.root; zfs list -t snapshot +NAME USED AVAIL REFER MOUNTPOINT +mypool/var/newname@first_snapshot 0 - 87.5K - +&prompt.root; zfs rename mypool/var/newname@first_snapshot new_snapshot_name +&prompt.root; zfs list -t snapshot +NAME USED AVAIL REFER MOUNTPOINT +mypool/var/newname@new_snapshot_name 0 - 87.5K - @@ -1295,94 +1886,134 @@ tank custom:costcenter - Snapshots are one of the most powerful features of ZFS. A snapshot provides a read-only, point-in-time copy of the - dataset. With the ZFS Copy-On-Write (COW) implementation, + dataset. With Copy-On-Write (COW), snapshots can be created quickly by preserving the older - version of the data on disk. When no snapshot is created, ZFS - reclaims the space for future use. Snapshots preserve disk - space by recording only the differences that happened between - snapshots. Snapshots are allowed only on whole datasets, not - on individual files or directories. When a snapshot is - created from a dataset, everything contained in it is - duplicated. This includes the filesystem properties, files, - directories, permissions, and so on. - - Snapshots in ZFS provide a variety of - features that other filesystems with snapshot functionality - lack. A typical example for snapshots is to have a quick way - of backing up the current state of the filesystem when a risky - action like a software installation or a system upgrade is - performed. If the action fails, the snapshot can be rolled - back and the system has the same state as when the snapshot - was created. If the upgrade was successful, the snapshot can - be deleted to free up space. Without snapshots, a failed - upgrade often requires a restore from backup, which is - tedious, time consuming, and may require a downtime in which - the system cannot be used as normal. Snapshots can be rolled - back quickly and can be taken when the system is running in - normal operation, with little or no downtime. The time - savings are enormous considering multi-terabyte storage - systems and the time required to copy the data from backup. - Snapshots are not a replacement for a complete backup of a - pool, but can be used as a quick and easy way to store a copy - of the dataset at a specific point in time. + version of the data on disk. If no snapshots exist, space is + reclaimed for future use when data is rewritten or deleted. + Snapshots preserve disk space by recording only the + differences between the current dataset and a previous + version. Snapshots are allowed only on whole datasets, not on + individual files or directories. When a snapshot is created + from a dataset, everything contained in it is duplicated. + This includes the file system properties, files, directories, + permissions, and so on. Snapshots use no additional space + when they are first created, only consuming space as the + blocks they reference are changed. Recursive snapshots taken + with create a snapshot with the same name + on the dataset and all of its children, providing a consistent + moment-in-time snapshot of all of the file systems. This can + be important when an application has files on multiple + datasets that are related or dependent upon each other. + Without snapshots, a backup would have copies of the files + from different points in time. + + Snapshots in ZFSprovide a variety of + features that even other file systems with snapshot + functionality lack. A typical example of snapshot use is to + have a quick way of backing up the current state of the file + system when a risky action like a software installation or a + system upgrade is performed. If the action fails, the + snapshot can be rolled back and the system has the same state + as when the snapshot was created. If the upgrade was + successful, the snapshot can be deleted to free up space. + Without snapshots, a failed upgrade often requires a restore + from backup, which is tedious, time consuming, and may require + downtime during which the system cannot be used. Snapshots *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-projects@FreeBSD.ORG Wed Jun 4 01:31:24 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87434ABF; Wed, 4 Jun 2014 01:31:24 +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 682B52059; Wed, 4 Jun 2014 01:31:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s541VOpP037432; Wed, 4 Jun 2014 01:31:24 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s541VOet037431; Wed, 4 Jun 2014 01:31:24 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201406040131.s541VOet037431@svn.freebsd.org> From: Warren Block Date: Wed, 4 Jun 2014 01:31:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r45004 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 01:31:24 -0000 Author: wblock Date: Wed Jun 4 01:31:23 2014 New Revision: 45004 URL: http://svnweb.freebsd.org/changeset/doc/45004 Log: More assorted fixes and cleanups. Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Tue Jun 3 23:21:48 2014 (r45003) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Wed Jun 4 01:31:23 2014 (r45004) @@ -162,9 +162,9 @@ devfs 1 1 0 example 17547136 0 17547136 0% /example This output shows that the example pool - has been created and mounted. It is now - accessible as a file system. Files can be created on it and - users can browse it, like in this example: + has been created and mounted. It is now accessible as a file + system. Files can be created on it and users can browse it, + like in this example: &prompt.root; cd /example &prompt.root; ls @@ -578,18 +578,19 @@ config: errors: No known data errors Pools can also be constructed using partitions rather than - whole disks. Putting ZFS in a separate partition allows the - same disk to have other partitions for other purposes. In - particular, partitions with bootcode and file systems needed - for booting can be added. This allows booting from disks that - are also members of a pool. There is no performance penalty - on &os; when using a partition rather than a whole disk. - Using partitions also allows the administrator to - under-provision the disks, using less - than the full capacity. If a future replacement disk of the - same nominal size as the original actually has a slightly - smaller capacity, the smaller partition will still fit, and - the replacement disk can still be used. + whole disks. Putting ZFS in a separate + partition allows the same disk to have other partitions for + other purposes. In particular, partitions with bootcode and + file systems needed for booting can be added. This allows + booting from disks that are also members of a pool. There is + no performance penalty on &os; when using a partition rather + than a whole disk. Using partitions also allows the + administrator to under-provision the + disks, using less than the full capacity. If a future + replacement disk of the same nominal size as the original + actually has a slightly smaller capacity, the smaller + partition will still fit, and the replacement disk can still + be used. Create a RAID-Z2 pool using @@ -722,7 +723,7 @@ errors: No known data errors RAID-Z vdevs risks the data on the entire pool. Writes are distributed, so the failure of the non-redundant disk will result in the loss of a fraction of - every block that has been writen to the pool. + every block that has been written to the pool. Data is striped across each of the vdevs. For example, with two mirror vdevs, this is effectively a @@ -1278,16 +1279,16 @@ errors: No known data errors resilver operation, the pool can grow to use the capacity of the new device. For example, consider a mirror of a 1 TB drive and a - 2 drive. The usable space is 1 . Then the + 2 drive. The usable space is 1 TB. Then the 1 TB is replaced with another 2 TB drive, and the resilvering process duplicates existing data. Because both of the devices now have 2 TB capacity, the mirror's available space can be grown to 2 TB. Expansion is triggered by using - zpool online with on - each device. After expansion of all devices, the additional - space becomes available to the pool. + zpool online -e on each device. After + expansion of all devices, the additional space becomes + available to the pool. @@ -1301,10 +1302,11 @@ errors: No known data errors operating systems that support ZFS, and even different hardware architectures (with some caveats, see &man.zpool.8;). When a dataset has open files, - can be used to force the export of a pool. - Use this with caution. The datasets are forcibly unmounted, - potentially resulting in unexpected behavior by the - applications which had open files on those datasets. + zpool export -f can be used to force the + export of a pool. Use this with caution. The datasets are + forcibly unmounted, potentially resulting in unexpected + behavior by the applications which had open files on those + datasets. Export a pool that is not in use: @@ -1312,14 +1314,16 @@ errors: No known data errors Importing a pool automatically mounts the datasets. This may not be the desired behavior, and can be prevented with - . sets temporary - properties for this import only. - allows importing a pool with a base mount point instead of - the root of the file system. If the pool was last used on a - different system and was not properly exported, an import - might have to be forced with . - imports all pools that do not appear to be - in use by another system. + zpool import -N. + zpool import -o sets temporary properties + for this import only. + zpool import altroot= allows importing a + pool with a base mount point instead of the root of the file + system. If the pool was last used on a different system and + was not properly exported, an import might have to be forced + with zpool import -f. + zpool import -a imports all pools that do + not appear to be in use by another system. List all available pools for import: @@ -1401,9 +1405,9 @@ Enabled the following features on 'mypoo The newer features of ZFS will not be available until zpool upgrade has - completed. can be used to see what new - features will be provided by upgrading, as well as which - features are already supported. + completed. zpool upgrade -v can be used to + see what new features will be provided by upgrading, as well + as which features are already supported. Upgrade a pool to support additional feature flags: @@ -1716,10 +1720,9 @@ mypool/var/log 178K 93.2G 178K mypool/var/mail 144K 93.2G 144K /var/mail mypool/var/tmp 152K 93.2G 152K /var/tmp - In modern versions of - ZFS, zfs destroy - is asynchronous, and the free space might take several - minutes to appear in the pool. Use + In modern versions of ZFS, + zfs destroy is asynchronous, and the free + space might take several minutes to appear in the pool. Use zpool get freeing poolname to see the freeing property, indicating how many @@ -2107,7 +2110,7 @@ M /var/tmp/ Snapshot Rollback - Once at least one snapshot is available, it can be + When at least one snapshot is available, it can be rolled back to at any time. Most of the time this is the case when the current state of the dataset is no longer required and an older version is preferred. Scenarios such @@ -2151,11 +2154,11 @@ vi.recover &prompt.user; At this point, the user realized that too many files - were deleted and wants them back. ZFS provides an easy way - to get them back using rollbacks, but only when snapshots of - important data are performed on a regular basis. To get the - files back and start over from the last snapshot, issue the - command: + were deleted and wants them back. ZFS + provides an easy way to get them back using rollbacks, but + only when snapshots of important data are performed on a + regular basis. To get the files back and start over from + the last snapshot, issue the command: &prompt.root; zfs rollback mypool/var/tmp@diff_snapshot &prompt.user; ls /var/tmp @@ -2164,8 +2167,8 @@ passwd passwd.copy vi.recov The rollback operation restored the dataset to the state of the last snapshot. It is also possible to roll back to a snapshot that was taken much earlier and has other snapshots - that were created after it. When trying to do this, ZFS - will issue this warning: + that were created after it. When trying to do this, + ZFS will issue this warning: &prompt.root; zfs list -rt snapshot mypool/var/tmp AME USED AVAIL REFER MOUNTPOINT @@ -2334,8 +2337,8 @@ usr/home/joenew 1.3G 31k 1.3G After a clone is created it is an exact copy of the state the dataset was in when the snapshot was taken. The clone can now be changed independently from its originating dataset. - The only connection between the two is the snapshot. ZFS - records this connection in the property + The only connection between the two is the snapshot. + ZFS records this connection in the property origin. Once the dependency between the snapshot and the clone has been removed by promoting the clone using zfs promote, the @@ -2368,7 +2371,7 @@ backup.txz loader.conf plans.txt Filesystem Size Used Avail Capacity Mounted on usr/home/joe 1.3G 128k 1.3G 0% /usr/home/joe - The cloned snapshot is now handled by ZFS like an ordinary + The cloned snapshot is now handled like an ordinary dataset. It contains all the data from the original snapshot plus the files that were added to it like loader.conf. Clones can be used in @@ -2388,14 +2391,13 @@ usr/home/joe 1.3G 128k 1.3G Keeping data on a single pool in one location exposes it to risks like theft and natural or human disasters. Making regular backups of the entire pool is vital. - ZFS provides a built-in - serialization feature that can send a stream representation of - the data to standard output. Using this technique, it is - possible to not only store the data on another pool connected - to the local system, but also to send it over a network to - another system. Snapshots are the basis for - this replication (see the section on - ZFS + ZFS provides a built-in serialization + feature that can send a stream representation of the data to + standard output. Using this technique, it is possible to not + only store the data on another pool connected to the local + system, but also to send it over a network to another system. + Snapshots are the basis for this replication (see the section + on ZFS snapshots). The commands used for replicating data are zfs send and zfs receive. @@ -2503,11 +2505,11 @@ mypool 960M 50.2M 910M 5% 1.00x second snapshot contains only the changes that were made to the file system between now and the previous snapshot, replica1. Using - with zfs send and - indicating the pair of snapshots generates an incremental - replica stream containing only the data that has changed. - This can only succeed if the initial snapshot already exists - on the receiving side. + zfs send -i and indicating the pair of + snapshots generates an incremental replica stream containing + only the data that has changed. This can only succeed if + the initial snapshot already exists on the receiving + side. &prompt.root; zfs send -v -i mypool@replica1 mypool@replica2 | zfs receive /backup/mypool send from @replica1 to mypool@replica2 estimated size is 5.02M @@ -2874,7 +2876,7 @@ mypool/compressed_dataset logicalused Deduplication When enabled, - Deduplication + deduplication uses the checksum of each block to detect duplicate blocks. When a new block is a duplicate of an existing block, ZFS writes an additional reference to the @@ -3050,7 +3052,7 @@ dedup = 1.05, compress = 1.11, copies = vfs.zfs.arc_max - - The maximum size of the ARC. The default is all RAM less 1 GB, or one half of RAM, whichever is more. @@ -3063,7 +3065,7 @@ dedup = 1.05, compress = 1.11, copies = vfs.zfs.arc_meta_limit - - Limits the portion of the + - Limit the portion of the ARC that can be used to store metadata. The default is one fourth of vfs.zfs.arc_max. Increasing @@ -3079,7 +3081,7 @@ dedup = 1.05, compress = 1.11, copies = vfs.zfs.arc_min - - The minimum size of the ARC. The default is one half of vfs.zfs.arc_meta_limit. Adjust this @@ -3103,9 +3105,9 @@ dedup = 1.05, compress = 1.11, copies = vfs.zfs.min_auto_ashift - - The minimum ashift (sector size) - that will be used automatically at pool creation time. - The value is a power of two. The default value of + - Minimum ashift (sector size) that + will be used automatically at pool creation time. The + value is a power of two. The default value of 9 represents 2^9 = 512, a sector size of 512 bytes. To avoid write amplification and get @@ -3196,7 +3198,7 @@ dedup = 1.05, compress = 1.11, copies = vfs.zfs.top_maxinflight - - The maxmimum number of outstanding I/Os per top-level + - Maxmimum number of outstanding I/Os per top-level vdev. Limits the depth of the command queue to prevent high latency. The limit is per top-level vdev, meaning the limit applies to @@ -3964,8 +3966,7 @@ vfs.zfs.vdev.cache.size="5M"ZFS will attempt to recover the data from any available redundancy, like mirrors or RAID-Z). - Validation of all checksums can be triggered with - scrub. Checksum algorithms include: @@ -4071,11 +4072,11 @@ vfs.zfs.vdev.cache.size="5M"When set to a value greater than 1, the copies property instructs ZFS to maintain multiple copies of - each block in the File System or - Volume. Setting this - property on important datasets provides additional + each block in the + File System + or + Volume. Setting + this property on important datasets provides additional redundancy from which to recover a block that does not match its checksum. In pools without redundancy, the copies feature is the only form of redundancy. The @@ -4132,19 +4133,17 @@ vfs.zfs.vdev.cache.size="5M"ZFS has scrub. scrub reads all data blocks stored on the pool and verifies their checksums against the known - good checksums stored in the metadata. A periodic - check of all the data stored on the pool ensures the - recovery of any corrupted blocks before they are needed. - A scrub is not required after an unclean shutdown, but - is recommended at least once - every three months. The checksum of each block is - verified as blocks are read during normal use, but a - scrub makes certain that even + good checksums stored in the metadata. A periodic check + of all the data stored on the pool ensures the recovery + of any corrupted blocks before they are needed. A scrub + is not required after an unclean shutdown, but is + recommended at least once every three months. The + checksum of each block is verified as blocks are read + during normal use, but a scrub makes certain that even infrequently used blocks are checked for silent - corruption. Data security is improved, - especially in archival storage situations. The relative - priority of scrub can be adjusted - with scrub can be adjusted with vfs.zfs.scrub_delay to prevent the scrub from degrading the performance of other workloads on the pool. @@ -4257,10 +4256,9 @@ vfs.zfs.vdev.cache.size="5M"storage/home/bob, enough disk space must exist outside of the refreservation amount for the - operation to succeed. Descendants of the main - data set are not counted in the - refreservation amount and so do not - encroach on the space set. + operation to succeed. Descendants of the main data set + are not counted in the refreservation + amount and so do not encroach on the space set. From owner-svn-doc-projects@FreeBSD.ORG Fri Jun 27 02:59:25 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 77112B1F; Fri, 27 Jun 2014 02:59:25 +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 5F65A2510; Fri, 27 Jun 2014 02:59:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R2xP2D079319; Fri, 27 Jun 2014 02:59:25 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R2xOei079309; Fri, 27 Jun 2014 02:59:24 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201406270259.s5R2xOei079309@svn.freebsd.org> From: Glen Barber Date: Fri, 27 Jun 2014 02:59:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r45131 - in projects/sysctl: . de_DE.ISO8859-1/books/handbook de_DE.ISO8859-1/books/handbook/advanced-networking de_DE.ISO8859-1/books/handbook/bsdinstall de_DE.ISO8859-1/books/handbook... X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 02:59:25 -0000 Author: gjb Date: Fri Jun 27 02:59:22 2014 New Revision: 45131 URL: http://svnweb.freebsd.org/changeset/doc/45131 Log: MFH @r45130: Tracking commit. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Added: projects/sysctl/.arcconfig - copied unchanged from r45130, head/.arcconfig projects/sysctl/en_US.ISO8859-1/articles/pgpkeys/ - copied from r45130, head/en_US.ISO8859-1/articles/pgpkeys/ projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report-2014-01-2014-03.xml - copied unchanged from r45130, head/en_US.ISO8859-1/htdocs/news/status/report-2014-01-2014-03.xml projects/sysctl/en_US.ISO8859-1/htdocs/projects/2014-freebsd-gsoc-thumbnail.jpg - copied unchanged from r45130, head/en_US.ISO8859-1/htdocs/projects/2014-freebsd-gsoc-thumbnail.jpg projects/sysctl/en_US.ISO8859-1/htdocs/projects/2014-freebsd-gsoc.pdf - copied unchanged from r45130, head/en_US.ISO8859-1/htdocs/projects/2014-freebsd-gsoc.pdf projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.3R/ - copied from r45130, head/en_US.ISO8859-1/htdocs/releases/9.3R/ projects/sysctl/fr_FR.ISO8859-1/books/handbook/bsdinstall/ - copied from r45130, head/fr_FR.ISO8859-1/books/handbook/bsdinstall/ projects/sysctl/share/Makefile - copied unchanged from r45130, head/share/Makefile projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-boot-options-menu.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-boot-options-menu.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-keymap-10.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-keymap-10.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-newboot-loader-menu.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-newboot-loader-menu.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_info.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_info.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-menu.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-menu.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png projects/sysctl/share/images/books/handbook/bsdinstall/bsdinstall-zfs-warning.png - copied unchanged from r45130, head/share/images/books/handbook/bsdinstall/bsdinstall-zfs-warning.png projects/sysctl/share/pgpkeys/Makefile - copied unchanged from r45130, head/share/pgpkeys/Makefile projects/sysctl/share/pgpkeys/allanjude.key - copied unchanged from r45130, head/share/pgpkeys/allanjude.key projects/sysctl/share/pgpkeys/kadesai.key - copied unchanged from r45130, head/share/pgpkeys/kadesai.key projects/sysctl/share/pgpkeys/lstewart.key - copied unchanged from r45130, head/share/pgpkeys/lstewart.key projects/sysctl/share/pgpkeys/pi.key - copied unchanged from r45130, head/share/pgpkeys/pi.key projects/sysctl/share/pgpkeys/pkelsey.key - copied unchanged from r45130, head/share/pgpkeys/pkelsey.key projects/sysctl/share/pgpkeys/plosher.key - copied unchanged from r45130, head/share/pgpkeys/plosher.key projects/sysctl/share/pgpkeys/robak.key - copied unchanged from r45130, head/share/pgpkeys/robak.key projects/sysctl/share/pgpkeys/shurd.key - copied unchanged from r45130, head/share/pgpkeys/shurd.key projects/sysctl/share/pgpkeys/slm.key - copied unchanged from r45130, head/share/pgpkeys/slm.key projects/sysctl/share/pgpkeys/xmj.key - copied unchanged from r45130, head/share/pgpkeys/xmj.key projects/sysctl/share/security/advisories/FreeBSD-EN-14:03.pkg.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-EN-14:03.pkg.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:04.kldxref.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-EN-14:04.kldxref.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:05.ciss.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-EN-14:05.ciss.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:06.exec.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-EN-14:06.exec.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:07.pmap.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-EN-14:07.pmap.asc projects/sysctl/share/security/advisories/FreeBSD-EN-14:08.heimdal.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-EN-14:08.heimdal.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:05.nfsserver.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:05.nfsserver.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:06.openssl.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:06.openssl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:07.devfs.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:07.devfs.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:08.tcp.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:08.tcp.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:09.openssl.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:09.openssl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:10.openssl.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:10.openssl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:11.sendmail.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:11.sendmail.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:12.ktrace.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:12.ktrace.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:13.pam.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:13.pam.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:14.openssl.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:14.openssl.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:15.iconv.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:15.iconv.asc projects/sysctl/share/security/advisories/FreeBSD-SA-14:16.file.asc - copied unchanged from r45130, head/share/security/advisories/FreeBSD-SA-14:16.file.asc projects/sysctl/share/security/patches/EN-14:03/ - copied from r45130, head/share/security/patches/EN-14:03/ projects/sysctl/share/security/patches/EN-14:04/ - copied from r45130, head/share/security/patches/EN-14:04/ projects/sysctl/share/security/patches/EN-14:05/ - copied from r45130, head/share/security/patches/EN-14:05/ projects/sysctl/share/security/patches/EN-14:06/ - copied from r45130, head/share/security/patches/EN-14:06/ projects/sysctl/share/security/patches/EN-14:07/ - copied from r45130, head/share/security/patches/EN-14:07/ projects/sysctl/share/security/patches/EN-14:08/ - copied from r45130, head/share/security/patches/EN-14:08/ projects/sysctl/share/security/patches/SA-14:05/ - copied from r45130, head/share/security/patches/SA-14:05/ projects/sysctl/share/security/patches/SA-14:06/ - copied from r45130, head/share/security/patches/SA-14:06/ projects/sysctl/share/security/patches/SA-14:07/ - copied from r45130, head/share/security/patches/SA-14:07/ projects/sysctl/share/security/patches/SA-14:08/ - copied from r45130, head/share/security/patches/SA-14:08/ projects/sysctl/share/security/patches/SA-14:09/ - copied from r45130, head/share/security/patches/SA-14:09/ projects/sysctl/share/security/patches/SA-14:10/ - copied from r45130, head/share/security/patches/SA-14:10/ projects/sysctl/share/security/patches/SA-14:11/ - copied from r45130, head/share/security/patches/SA-14:11/ projects/sysctl/share/security/patches/SA-14:12/ - copied from r45130, head/share/security/patches/SA-14:12/ projects/sysctl/share/security/patches/SA-14:13/ - copied from r45130, head/share/security/patches/SA-14:13/ projects/sysctl/share/security/patches/SA-14:14/ - copied from r45130, head/share/security/patches/SA-14:14/ projects/sysctl/share/security/patches/SA-14:15/ - copied from r45130, head/share/security/patches/SA-14:15/ projects/sysctl/share/security/patches/SA-14:16/ - copied from r45130, head/share/security/patches/SA-14:16/ - copied from r45130, head/zh_TW.UTF-8/ Directory Properties: projects/sysctl/zh_TW.UTF-8/ (props changed) Deleted: projects/sysctl/en_US.ISO8859-1/articles/cvs-freebsd/ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/ projects/sysctl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/ projects/sysctl/en_US.ISO8859-1/htdocs/gnome/images/hippobutt.jpg projects/sysctl/en_US.ISO8859-1/htdocs/internal/statistic.xml projects/sysctl/en_US.ISO8859-1/htdocs/projects/2009-freebsd-gsoc-thumbnail.jpg projects/sysctl/en_US.ISO8859-1/htdocs/projects/2009-freebsd-gsoc.pdf projects/sysctl/en_US.ISO8859-1/htdocs/projects/2010-freebsd-gsoc-thumbnail.jpg projects/sysctl/en_US.ISO8859-1/htdocs/projects/2010-freebsd-gsoc.pdf projects/sysctl/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc-thumbnail.jpg projects/sysctl/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc.jpg projects/sysctl/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc.pdf projects/sysctl/en_US.ISO8859-1/htdocs/projects/2013-freebsd-gsoc-thumbnail.jpg projects/sysctl/en_US.ISO8859-1/htdocs/projects/2013-freebsd-gsoc.pdf projects/sysctl/zh_TW.Big5/ Modified: projects/sysctl/Makefile (contents, props changed) projects/sysctl/README (contents, props changed) projects/sysctl/de_DE.ISO8859-1/books/handbook/Makefile projects/sysctl/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/sysctl/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/sysctl/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml projects/sysctl/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml projects/sysctl/de_DE.ISO8859-1/books/handbook/jails/chapter.xml projects/sysctl/de_DE.ISO8859-1/htdocs/index.xsl projects/sysctl/de_DE.ISO8859-1/htdocs/projects/newbies.xml projects/sysctl/de_DE.ISO8859-1/share/xml/header.l10n.ent projects/sysctl/de_DE.ISO8859-1/share/xml/navibar.l10n.ent projects/sysctl/de_DE.ISO8859-1/share/xml/news.xml projects/sysctl/de_DE.ISO8859-1/share/xml/press.xml projects/sysctl/el_GR.ISO8859-7/books/handbook/Makefile projects/sysctl/en_US.ISO8859-1/articles/Makefile projects/sysctl/en_US.ISO8859-1/articles/building-products/article.xml projects/sysctl/en_US.ISO8859-1/articles/committers-guide/article.xml projects/sysctl/en_US.ISO8859-1/articles/console-server/article.xml projects/sysctl/en_US.ISO8859-1/articles/contributing/article.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/sysctl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml projects/sysctl/en_US.ISO8859-1/articles/cups/article.xml projects/sysctl/en_US.ISO8859-1/articles/custom-gcc/article.xml projects/sysctl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/sysctl/en_US.ISO8859-1/articles/filtering-bridges/article.xml projects/sysctl/en_US.ISO8859-1/articles/fonts/article.xml projects/sysctl/en_US.ISO8859-1/articles/freebsd-update-server/article.xml projects/sysctl/en_US.ISO8859-1/articles/geom-class/article.xml projects/sysctl/en_US.ISO8859-1/articles/hubs/article.xml projects/sysctl/en_US.ISO8859-1/articles/ipsec-must/article.xml projects/sysctl/en_US.ISO8859-1/articles/laptop/article.xml projects/sysctl/en_US.ISO8859-1/articles/ldap-auth/article.xml projects/sysctl/en_US.ISO8859-1/articles/linux-users/article.xml projects/sysctl/en_US.ISO8859-1/articles/mh/article.xml projects/sysctl/en_US.ISO8859-1/articles/nanobsd/article.xml projects/sysctl/en_US.ISO8859-1/articles/new-users/article.xml projects/sysctl/en_US.ISO8859-1/articles/p4-primer/article.xml projects/sysctl/en_US.ISO8859-1/articles/pam/article.xml projects/sysctl/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml projects/sysctl/en_US.ISO8859-1/articles/portbuild/article.xml projects/sysctl/en_US.ISO8859-1/articles/pr-guidelines/article.xml projects/sysctl/en_US.ISO8859-1/articles/problem-reports/article.xml projects/sysctl/en_US.ISO8859-1/articles/rc-scripting/article.xml projects/sysctl/en_US.ISO8859-1/articles/releng/article.xml projects/sysctl/en_US.ISO8859-1/articles/remote-install/article.xml projects/sysctl/en_US.ISO8859-1/articles/serial-uart/article.xml projects/sysctl/en_US.ISO8859-1/articles/solid-state/article.xml projects/sysctl/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml projects/sysctl/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml projects/sysctl/en_US.ISO8859-1/books/design-44bsd/book.xml projects/sysctl/en_US.ISO8859-1/books/dev-model/book.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml projects/sysctl/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml projects/sysctl/en_US.ISO8859-1/books/faq/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/book.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml projects/sysctl/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/Makefile projects/sysctl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/audit/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/basics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/book.xml projects/sysctl/en_US.ISO8859-1/books/handbook/boot/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/config/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/disks/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/geom/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/install/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/jails/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/l10n/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mac/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/printing/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/security/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml projects/sysctl/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/sysctl/en_US.ISO8859-1/books/pmake/basics/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/appendices/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/uses.xml projects/sysctl/en_US.ISO8859-1/books/porters-handbook/versions.xml projects/sysctl/en_US.ISO8859-1/htdocs/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/administration.xml projects/sysctl/en_US.ISO8859-1/htdocs/cgi/cgi-lib.pl projects/sysctl/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl projects/sysctl/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/sysctl/en_US.ISO8859-1/htdocs/cgi/monthly.cgi projects/sysctl/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi projects/sysctl/en_US.ISO8859-1/htdocs/cgi/query-pr.cgi projects/sysctl/en_US.ISO8859-1/htdocs/commercial/commercial.xml projects/sysctl/en_US.ISO8859-1/htdocs/doc/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/docproj/submitting.xml projects/sysctl/en_US.ISO8859-1/htdocs/docs/books.xml projects/sysctl/en_US.ISO8859-1/htdocs/donations/donors.xml projects/sysctl/en_US.ISO8859-1/htdocs/donations/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/gnome/contact.xml projects/sysctl/en_US.ISO8859-1/htdocs/gnome/images/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/index.xsl projects/sysctl/en_US.ISO8859-1/htdocs/internal/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/internal/about.xml projects/sysctl/en_US.ISO8859-1/htdocs/internal/doceng.xml projects/sysctl/en_US.ISO8859-1/htdocs/internal/machines.xml projects/sysctl/en_US.ISO8859-1/htdocs/internal/mirror.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/2009/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/news/status/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/news/status/README projects/sysctl/en_US.ISO8859-1/htdocs/news/status/howto.xml projects/sysctl/en_US.ISO8859-1/htdocs/news/status/report.xsl projects/sysctl/en_US.ISO8859-1/htdocs/news/status/status.xml projects/sysctl/en_US.ISO8859-1/htdocs/portmgr/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/projects/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/projects/summerofcode.xml projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/errata.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/installation.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/10.0R/relnotes.html projects/sysctl/en_US.ISO8859-1/htdocs/releases/9.2R/errata.html (contents, props changed) projects/sysctl/en_US.ISO8859-1/htdocs/releases/Makefile projects/sysctl/en_US.ISO8859-1/htdocs/releases/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/releng/index.xml projects/sysctl/en_US.ISO8859-1/htdocs/relnotes.xml projects/sysctl/en_US.ISO8859-1/htdocs/search/sitemap.xml projects/sysctl/en_US.ISO8859-1/htdocs/security/security.xml projects/sysctl/en_US.ISO8859-1/htdocs/security/unsupported.xml projects/sysctl/en_US.ISO8859-1/htdocs/send-pr.xml projects/sysctl/en_US.ISO8859-1/htdocs/support.xml projects/sysctl/en_US.ISO8859-1/htdocs/support/bugreports.xml projects/sysctl/en_US.ISO8859-1/share/xml/mailing-lists.ent projects/sysctl/en_US.ISO8859-1/share/xml/release.l10n.ent projects/sysctl/es_ES.ISO8859-1/books/handbook/Makefile projects/sysctl/es_ES.ISO8859-1/htdocs/index.xsl projects/sysctl/fr_FR.ISO8859-1/books/handbook/Makefile projects/sysctl/fr_FR.ISO8859-1/books/handbook/book.xml projects/sysctl/fr_FR.ISO8859-1/books/handbook/chapters.ent projects/sysctl/fr_FR.ISO8859-1/htdocs/doc/Makefile projects/sysctl/hu_HU.ISO8859-2/books/handbook/Makefile projects/sysctl/it_IT.ISO8859-15/books/handbook/Makefile projects/sysctl/ja_JP.eucJP/books/handbook/Makefile projects/sysctl/ja_JP.eucJP/books/handbook/basics/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/book.xml projects/sysctl/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/desktop/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/install/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/mirrors/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/multimedia/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/ports/chapter.xml projects/sysctl/ja_JP.eucJP/books/handbook/preface/preface.xml projects/sysctl/ja_JP.eucJP/htdocs/commercial/commercial.xml projects/sysctl/ja_JP.eucJP/htdocs/docproj/submitting.xml projects/sysctl/ja_JP.eucJP/htdocs/docs/books.xml projects/sysctl/ja_JP.eucJP/htdocs/index.xsl projects/sysctl/ja_JP.eucJP/htdocs/internal/about.xml projects/sysctl/ja_JP.eucJP/htdocs/internal/machines.xml projects/sysctl/ja_JP.eucJP/htdocs/internal/mirror.xml projects/sysctl/ja_JP.eucJP/htdocs/releases/index.xml projects/sysctl/ja_JP.eucJP/htdocs/relnotes.xml projects/sysctl/ja_JP.eucJP/htdocs/search/sitemap.xml projects/sysctl/ja_JP.eucJP/htdocs/security/security.xml projects/sysctl/ja_JP.eucJP/htdocs/security/unsupported.xml projects/sysctl/ja_JP.eucJP/htdocs/send-pr.xml projects/sysctl/ja_JP.eucJP/htdocs/support.xml projects/sysctl/ja_JP.eucJP/htdocs/support/bugreports.xml projects/sysctl/ja_JP.eucJP/share/xml/header.l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/libcommon.xsl projects/sysctl/ja_JP.eucJP/share/xml/navibar.l10n.ent projects/sysctl/ja_JP.eucJP/share/xml/news.xml projects/sysctl/nl_NL.ISO8859-1/books/handbook/Makefile projects/sysctl/nl_NL.ISO8859-1/htdocs/send-pr.xml projects/sysctl/pl_PL.ISO8859-2/books/handbook/Makefile projects/sysctl/pt_BR.ISO8859-1/books/handbook/Makefile projects/sysctl/release/Makefile projects/sysctl/ru_RU.KOI8-R/articles/committers-guide/article.xml projects/sysctl/ru_RU.KOI8-R/articles/console-server/article.xml projects/sysctl/ru_RU.KOI8-R/articles/cups/article.xml projects/sysctl/ru_RU.KOI8-R/articles/custom-gcc/article.xml projects/sysctl/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml projects/sysctl/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml projects/sysctl/ru_RU.KOI8-R/articles/fonts/article.xml projects/sysctl/ru_RU.KOI8-R/articles/geom-class/article.xml projects/sysctl/ru_RU.KOI8-R/articles/ipsec-must/article.xml projects/sysctl/ru_RU.KOI8-R/articles/mh/article.xml projects/sysctl/ru_RU.KOI8-R/articles/new-users/article.xml projects/sysctl/ru_RU.KOI8-R/articles/pam/article.xml projects/sysctl/ru_RU.KOI8-R/articles/portbuild/article.xml projects/sysctl/ru_RU.KOI8-R/articles/problem-reports/article.xml projects/sysctl/ru_RU.KOI8-R/articles/releng/article.xml projects/sysctl/ru_RU.KOI8-R/articles/solid-state/article.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/Makefile projects/sysctl/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/audit/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/basics/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/boot/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/config/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/disks/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/geom/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/install/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/mac/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/ports/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/printing/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/security/chapter.xml projects/sysctl/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml projects/sysctl/ru_RU.KOI8-R/htdocs/doc/Makefile projects/sysctl/share/misc/docbook.css projects/sysctl/share/mk/doc.docbook.mk projects/sysctl/share/pgpkeys/cs.key projects/sysctl/share/pgpkeys/dbn.key projects/sysctl/share/pgpkeys/decke.key projects/sysctl/share/pgpkeys/gavin.key projects/sysctl/share/pgpkeys/hiren.key projects/sysctl/share/pgpkeys/jadawin.key (contents, props changed) projects/sysctl/share/pgpkeys/jmg.key projects/sysctl/share/pgpkeys/jonathan.key projects/sysctl/share/pgpkeys/lme.key projects/sysctl/share/pgpkeys/madpilot.key projects/sysctl/share/pgpkeys/netchild.key projects/sysctl/share/pgpkeys/peter.key projects/sysctl/share/pgpkeys/pgpkeys-developers.xml projects/sysctl/share/pgpkeys/pgpkeys-other.xml projects/sysctl/share/pgpkeys/pgpkeys.ent projects/sysctl/share/pgpkeys/sbruno.key projects/sysctl/share/pgpkeys/scop.key projects/sysctl/share/pgpkeys/thomas.key projects/sysctl/share/pgpkeys/wblock.key projects/sysctl/share/xml/advisories.xml projects/sysctl/share/xml/authors.ent projects/sysctl/share/xml/commercial.consult.xml projects/sysctl/share/xml/commercial.isp.xml projects/sysctl/share/xml/docbook50.dtd projects/sysctl/share/xml/events2014.xml projects/sysctl/share/xml/freebsd-pgpkeyring.xsl projects/sysctl/share/xml/freebsd.ent projects/sysctl/share/xml/freebsd50.dtd projects/sysctl/share/xml/header.ent projects/sysctl/share/xml/libcommon.xsl projects/sysctl/share/xml/man-refs.ent projects/sysctl/share/xml/mirrors.xml projects/sysctl/share/xml/navibar.ent projects/sysctl/share/xml/news.xml projects/sysctl/share/xml/notices.xml projects/sysctl/share/xml/press.xml projects/sysctl/share/xml/release.ent projects/sysctl/share/xml/statusreport.dtd projects/sysctl/share/xml/templates.entries.xsl projects/sysctl/share/xml/trademarks.ent projects/sysctl/share/xml/urls.ent projects/sysctl/share/xml/usergroups.xml projects/sysctl/zh_CN.UTF-8/books/handbook/Makefile projects/sysctl/zh_CN.UTF-8/books/handbook/linuxemu/chapter.xml Directory Properties: projects/sysctl/ (props changed) projects/sysctl/de_DE.ISO8859-1/ (props changed) projects/sysctl/el_GR.ISO8859-7/ (props changed) projects/sysctl/en_US.ISO8859-1/ (props changed) projects/sysctl/es_ES.ISO8859-1/ (props changed) projects/sysctl/fr_FR.ISO8859-1/ (props changed) projects/sysctl/hu_HU.ISO8859-2/ (props changed) projects/sysctl/it_IT.ISO8859-15/ (props changed) projects/sysctl/ja_JP.eucJP/ (props changed) projects/sysctl/nl_NL.ISO8859-1/ (props changed) projects/sysctl/pl_PL.ISO8859-2/ (props changed) projects/sysctl/pt_BR.ISO8859-1/ (props changed) projects/sysctl/release/ (props changed) projects/sysctl/ru_RU.KOI8-R/ (props changed) projects/sysctl/share/ (props changed) projects/sysctl/zh_CN.UTF-8/ (props changed) Copied: projects/sysctl/.arcconfig (from r45130, head/.arcconfig) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sysctl/.arcconfig Fri Jun 27 02:59:22 2014 (r45131, copy of r45130, head/.arcconfig) @@ -0,0 +1,5 @@ +{ + "project.name": "D", + "phabricator.uri" : "https://phabric.freebsd.org/", + "history.immutable" : true +} Modified: projects/sysctl/Makefile ============================================================================== --- projects/sysctl/Makefile Fri Jun 27 00:17:54 2014 (r45130) +++ projects/sysctl/Makefile Fri Jun 27 02:59:22 2014 (r45131) @@ -28,9 +28,11 @@ SUBDIR+= ru_RU.KOI8-R SUBDIR+= sr_YU.ISO8859-2 SUBDIR+= tr_TR.ISO8859-9 SUBDIR+= zh_CN.UTF-8 -SUBDIR+= zh_TW.Big5 +SUBDIR+= zh_TW.UTF-8 .endif +SUBDIR+= share + DOC_PREFIX?= ${.CURDIR} .if exists(/usr/bin/svnlite) Modified: projects/sysctl/README ============================================================================== --- projects/sysctl/README Fri Jun 27 00:17:54 2014 (r45130) +++ projects/sysctl/README Fri Jun 27 02:59:22 2014 (r45131) @@ -5,5 +5,6 @@ our toolchain in your own projects, plea http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/fdp-primer/ -for information about the tools and formatting languages we use. Chapter -2 covers the software and related items you will need to install. +for information about the tools and formatting languages we use. +Chapter 1 has a Quick Start section, and Chapter 2 covers the software +and related items in more detail. Modified: projects/sysctl/de_DE.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/books/handbook/Makefile Fri Jun 27 00:17:54 2014 (r45130) +++ projects/sysctl/de_DE.ISO8859-1/books/handbook/Makefile Fri Jun 27 02:59:22 2014 (r45131) @@ -275,9 +275,6 @@ CHAPTERS?= ${SRCS:M*chapter.xml} XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./} XMLFLAGS+= -i chap.freebsd-glossary -pgpkeyring: pgpkeys/chapter.xml - @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC} - URL_RELPREFIX?= ../../../.. DOC_PREFIX?= ${.CURDIR}/../../.. Modified: projects/sysctl/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml ============================================================================== --- projects/sysctl/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Jun 27 00:17:54 2014 (r45130) +++ projects/sysctl/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml Fri Jun 27 02:59:22 2014 (r45131) @@ -4,17 +4,26 @@ The FreeBSD German Documentation Project $FreeBSD$ - $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.xml,v 1.195 2011/02/23 12:30:43 jkois Exp $ - basiert auf: 1.436 + $FreeBSDde:$ + basiert auf: r44080 --> - + + Weiterführende Netzwerkthemen - JohannKoisÜbersetzt von + + + Johann + Kois + + Übersetzt von + - + @@ -31,13 +40,17 @@ + Wissen, wie man USB Tethering einrichtet. + + + &bluetooth;- sowie drahtlose, der Norm &ieee; 802.11 - entsprechende, Geräte mit FreeBSD verwenden + entsprechende, Geräte mit &os; verwenden können. - Eine Bridge unter FreeBSD einrichten können. + Eine Bridge unter &os; einrichten können. @@ -46,8 +59,8 @@ - Wissen, wie man NAT (Network Address Translation) - einrichtet. + Wissen, wie man mithilfe von PXE über ein Netzwerk + bootet und ein NFS-Root-Dateisystem einrichtet. @@ -55,15 +68,11 @@ - IPv6 auf einem FreeBSD-Rechner einrichten + IPv6 auf einem &os;-Rechner einrichten können. - ATM einrichten können. - - - CARP, das Common Address Redundancy Protocol, unter &os; einsetzen können. @@ -83,7 +92,7 @@ - Einen neuen FreeBSD-Kernel konfigurieren und installieren + Einen neuen &os;-Kernel konfigurieren und installieren können (). @@ -95,14 +104,20 @@ - Gateways und Routen + + Gateways und Routen + - CoranthGryphonBeigetragen von + + + Coranth + Gryphon + + Beigetragen von + - - Routing @@ -184,7 +199,7 @@ host2.example.com link#1 Der nächste auffällige Punkt sind die mit 0:e0: beginnenden Adressen. Es handelt sich dabei um Ethernet Hardwareadressen, die auch als - MAC-Adressen bekannt sind. FreeBSD identifiziert Rechner im + MAC-Adressen bekannt sind. &os; identifiziert Rechner im lokalen Netz automatisch (im Beispiel test0) und fügt eine direkte Route zu diesem Rechner hinzu. Dies passiert über die Ethernet-Schnittstelle @@ -202,7 +217,7 @@ host2.example.com link#1 Subnetz - FreeBSD fügt außerdem Subnetzrouten für das + &os; fügt außerdem Subnetzrouten für das lokale Subnetz hinzu (10.20.30.255 ist die Broadcast-Adresse für das Subnetz 10.20.30, example.com ist der zu @@ -220,7 +235,7 @@ host2.example.com link#1 Die Zeile host1 bezieht sich auf unseren Rechner, der durch seine Ethernetadresse bekannt ist. - Da unser Rechner der Sender ist, verwendet FreeBSD automatisch + Da unser Rechner der Sender ist, verwendet &os; automatisch das Loopback-Gerät (lo0), anstatt den Datenverkehr über die Ethernetschnittstelle zu senden. @@ -519,7 +534,7 @@ host2.example.com link#1 Ein Netzwerkrouter ist einfach ein System, das Pakete von einer Schnittstelle zur anderen weiterleitet. Internetstandards und gute Ingenieurspraxis sorgten - dafür, dass diese Funktion in FreeBSD in der Voreinstellung + dafür, dass diese Funktion in &os; in der Voreinstellung deaktiviert ist. Sie können diese Funktion aktivieren, indem Sie in &man.rc.conf.5; folgende Änderung durchführen: @@ -532,14 +547,20 @@ host2.example.com link#1 unterbrechen wollen, können Sie die Variable auf 0 setzen. - BGP - RIP - OSPF + + BGP + + + RIP + + + OSPF + Ihr neuer Router benötigt nun noch Routen, um zu wissen, wohin er den Verkehr senden soll. Haben Sie ein (sehr) einfaches Netzwerk, können Sie statische Routen - verwenden. FreeBSD verfügt über den Standard + verwenden. &os; verfügt über den Standard BSD-Routing-Daemon &man.routed.8;, der RIP (sowohl Version 1 als auch Version 2) und IRDP versteht. BGP v4, OSPF v2 und andere Protokolle werden von @@ -551,11 +572,17 @@ host2.example.com link#1 Statische Routen einrichten - AlHoangBeigetragen von + + + Al + Hoang + + Beigetragen von + - + Manuelle Konfiguration @@ -792,17 +819,33 @@ route_net2="-net 192.168.1.0/24 192.168. Drahtlose Netzwerke - Loader - - MarcFonvieille - - MurrayStokely + + + Loader + + + + + + Marc + Fonvieille + + + + + + Murray + Stokely + + - - Netzwerke, drahtlos + + + Netzwerke, drahtlos + 802.11 drahtlose Netzwerke @@ -1541,8 +1584,8 @@ wlan0: flags=8843<UP,BROADCAST,RUNNIN angeben, nachdem wpa_supplicant Ihre Station authentifiziert hat: - &prompt.root; ifconfig wlan0 inet 192.168.0.100 netmask 255.255.255.0 -&prompt.root; ifconfig wlan0 + &prompt.root; ifconfig wlan0 inet 192.168.0.100 netmask 255.255.255.0 +&prompt.root; ifconfig wlan0 wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 ether 00:11:95:d5:43:62 inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255 @@ -1558,8 +1601,9 @@ wlan0: flags=8843<UP,BROADCAST,RUNNIN zusätzlich noch das Standard-Gateway sowie den/die Nameserver manuell festlegen: - &prompt.root; route add default your_default_router -&prompt.root; echo "nameserver your_DNS_server" >> /etc/resolv.conf + &prompt.root; route add default your_default_router + &prompt.root; echo "nameserver your_DNS_server" >> /etc/resolv.conf + @@ -1923,9 +1967,9 @@ wlan0: flags=8843<UP,BROADCAST,RUNNIN WEP kann über ifconfig aktiviert werden: - &prompt.root; ifconfig wlan0 create wlandev ath0 -&prompt.root; ifconfig wlan0 inet 192.168.1.100 netmask 255.255.255.0 \ - ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 + &prompt.root; ifconfig wlan0 create wlandev ath0 +&prompt.root; ifconfig wlan0 inet 192.168.1.100 netmask 255.255.255.0 \ + ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 @@ -1978,7 +2022,7 @@ wlan0: flags=8843<UP,BROADCAST,RUNNIN Danach müssen Sie das Programm noch aufrufen: - &prompt.root; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf + &prompt.root; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz) Associated with 00:13:46:49:41:76 @@ -1998,9 +2042,9 @@ Associated with 00:13:46:49:41:76Auf dem Rechner A geben Sie Folgendes ein: - &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode adhoc -&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap -&prompt.root; ifconfig wlan0 + &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode adhoc +&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap +&prompt.root; ifconfig wlan0 wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 ether 00:11:95:c3:0d:ac inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 @@ -2016,8 +2060,8 @@ Associated with 00:13:46:49:41:76Rechner B sollte nun in der Lage sein, Rechner A zu finden: - &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode adhoc -&prompt.root; ifconfig wlan0 up scan + &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode adhoc +&prompt.root; ifconfig wlan0 up scan SSID/MESH ID BSSID CHAN RATE S:N INT CAPS freebsdap 02:11:95:c3:0d:ac 2 54M -64:-96 100 IS WME @@ -2026,8 +2070,8 @@ Associated with 00:13:46:49:41:76B eine unterschiedliche IP-Adresse zuweisen: - &prompt.root; ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap -&prompt.root; ifconfig wlan0 + &prompt.root; ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap +&prompt.root; ifconfig wlan0 wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 ether 00:11:95:d5:43:62 inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255 @@ -2073,8 +2117,8 @@ Associated with 00:13:46:49:41:76 - &prompt.root; ifconfig wlan0 create wlandev ath0 -&prompt.root; ifconfig wlan0 list caps + &prompt.root; ifconfig wlan0 create wlandev ath0 +&prompt.root; ifconfig wlan0 list caps drivercaps=6f85edc1<STA,FF,TURBOP,IBSS,HOSTAP,AHDEMO,TXPMGT,SHSLOT,SHPREAMBLE,MONITOR,MBSS,WPA1,WPA2,BURST,WME,WDS,BGSCAN,TXFRAG> cryptocaps=1f<WEP,TKIP,AES,AES_CCM,TKIPMIC> @@ -2092,20 +2136,20 @@ cryptocaps=1f<WEP,TKIP,AES,AES_CCM,TK Zuvor erstellte Pseudo-Geräte müssen also vorher zerstört werden: - &prompt.root; ifconfig wlan0 destroy + &prompt.root; ifconfig wlan0 destroy Danach muss das Gerät erneut erstellt werden, bevor die restlichen Netzwerkparameter konfiguriert werden können: - &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode hostap -&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap mode 11g channel 1 + &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode hostap +&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap mode 11g channel 1 Benutzen Sie danach erneut den Befehl ifconfig, um den Status der wlan0-Schnittstelle abzufragen: - &prompt.root; ifconfig wlan0 + &prompt.root; ifconfig wlan0 wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 ether 00:11:95:c3:0d:ac inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 @@ -2130,7 +2174,7 @@ ifconfig_wlan0="inet 192.16 - Hostbasierender Access Point ohne Authentifizierung + <title>Hostbasierender Access Point ohne Authentifizierung oder Verschlüsselung Obwohl es nicht empfohlen wird, einen AP ohne jegliche @@ -2143,16 +2187,16 @@ ifconfig_wlan0="inet 192.16 haben, ist es möglich von einem anderen drahtlosen Computer eine Suche nach dem AP zu starten: - &prompt.root; ifconfig wlan0 create wlandev ath0 -&prompt.root; ifconfig wlan0 up scan + &prompt.root; ifconfig wlan0 create wlandev ath0 +&prompt.root; ifconfig wlan0 up scan SSID/MESH ID BSSID CHAN RATE S:N INT CAPS freebsdap 00:11:95:c3:0d:ac 1 54M -66:-96 100 ES WME Der Client-Rechner fand den Access Point und kann mit ihm verbunden werden: - &prompt.root; ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap -&prompt.root; ifconfig wlan0 + &prompt.root; ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap +&prompt.root; ifconfig wlan0 wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 ether 00:11:95:d5:43:62 inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255 @@ -2291,7 +2335,7 @@ wpa_pairwise=CCMP TKIP - Der Access Point läft nun, die Clients - können mit ihm verbunden werden. Weitere - Informationen finden Sie im - . Es ist möglich - zu sehen, welche Stationen mit dem AP verbunden sind. - Dazu geben Sie den Befehl - ifconfig wlan0 list sta - ein. - + Der Access Point läuft nun, die Clients können mit ihm + verbunden werden. Weitere Informationen finden Sie im + . Es ist möglich zu + sehen, welche Stationen mit dem AP verbunden sind. Dazu + geben Sie den Befehl ifconfig wlan0 list + sta ein. + - WEP hostbasierender Access Point + WEP hostbasierender Access Point - Es ist nicht empfehlenswert, einen Access Point mit - WEP zu konfigurieren, da es keine - Authentifikationsmechanismen gibt und WEP leicht zu - knacken ist. Einige ältere WLAN-Karten - unterstützen nur WEP als Sicherheitsprotokoll. Für - solche Karten ist es notwendig den AP ohne - Authentifikation, Verschlüsselung oder mit dem - WEP-Protokoll zu konfigurieren. - - Das Wireless-Gerät kann nun in den hostap-Modus - versetzt werden und mit der korrekten SSID und IP-Adresse - konfiguriert werden: - - &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode hostap -&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 \ - ssid freebsdap wepmode on weptxkey 3 wepkey 3:0x3456789012 mode 11g + Es ist nicht empfehlenswert, einen Access Point mit + WEP zu konfigurieren, da es keine + Authentifikationsmechanismen gibt und WEP leicht zu + knacken ist. Einige ältere WLAN-Karten unterstützen nur + WEP als Sicherheitsprotokoll. Für solche Karten ist es + notwendig den AP ohne Authentifikation, Verschlüsselung + oder mit dem WEP-Protokoll zu konfigurieren. + + Das Wireless-Gerät kann nun in den hostap-Modus + versetzt werden und mit der korrekten SSID und IP-Adresse + konfiguriert werden: + + &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode hostap +&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 \ + ssid freebsdap wepmode on weptxkey 3 wepkey 3:0x3456789012 mode 11g @@ -2358,7 +2399,7 @@ wpa_pairwise=CCMP TKIP Es ist möglich, von einem anderen drahtlosen Computer eine Suche nach dem AP zu starten: - &prompt.root; ifconfig wlan0 create wlandev ath0 + &prompt.root; ifconfig wlan0 create wlandev ath0 &prompt.root; ifconfig wlan0 up scan SSID BSSID CHAN RATE S:N INT CAPS freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS @@ -2463,7 +2504,7 @@ freebsdap 00:11:95:c3:0d:ac 1 Systemmeldungen auf die Konsole auszugeben, verwenden Sie den folgenden Befehl: - &prompt.root; wlandebug -i ath0 +scan+auth+debug+assoc + &prompt.root; wlandebug -i ath0 +scan+auth+debug+assoc net.wlan.0.debug: 0 => 0xc80000<assoc,auth,scan> Der 802.11-Layer liefert umfangreiche Statistiken, @@ -2486,18 +2527,52 @@ freebsdap 00:11:95:c3:0d:ac 1 + + USB Tethering + + + tether + + + Viele Mobiltelefone bieten die Möglichkeit, ihre + Datenverbindung über USB (oft "Tethering" genannt) zu + teilen. Diese Funktion verwendet das + RNDIS oder + CDC-Protokoll. + + Bevor Sie ein Gerät anschließen, laden Sie den + entsprechenden Treiber in den Kernel: + + &prompt.root; kldload if_urndis +&prompt.root; kldload cdce + + Sobald das Gerät angeschlossen ist, steht es Ihnen + unter ue0 + wie ein normales Netzwerkgerät zur Verfügung. + Stellen Sie sicher, dass die Option + USB Tethering auf dem Gerät + aktiviert ist. + + - Bluetooth + + Bluetooth + - PavLucistnikBeigetragen von -
pav@FreeBSD.org
- + + + Pav + Lucistnik + + Beigetragen von + pav@FreeBSD.org + - - - Bluetooth + + Bluetooth + Übersicht @@ -2576,7 +2651,9 @@ Number of SCO packets: 8 Das Host Controller Interface (HCI) - HCI + + HCI + Das Host Controller Interface (HCI) bietet eine Befehlsschnittstelle zum Basisbandcontroller @@ -2670,7 +2747,9 @@ Reason: Connection terminated by local h Das Logical Link Control and Adaptation Protocol (L2CAP) - L2CAP + + L2CAP + Das Logical Link Control and Adaptation Protocol (L2CAP) bietet @@ -2747,7 +2826,9 @@ c2e8bc80 0 250 00:02:72:00:d4:1a Das RFCOMM-Protokoll - RFCOMM + + RFCOMM + Das RFCOMM-Protokoll emuliert serielle Verbindungen über das L2CAP-Protokoll. Es basiert auf dem ETSI-Standard @@ -2781,7 +2862,9 @@ c2e8bc80 0 250 00:02:72:00:d4:1a Bluetooth-Geräten (Pairing) - Pairing + + Pairing + In der Voreinstellung nutzt Bluetooth keine Authentifizierung, daher kann sich jedes Bluetoothgerät mit @@ -2852,7 +2935,9 @@ hcsecd[16484]: Sending PIN_Code_Reply to Das Service Discovery Protocol (SDP) - SDP + + SDP + Das Service Discovery Protocol (SDP) erlaubt es Clientanwendungen, von Serveranwendungen @@ -2867,7 +2952,7 @@ hcsecd[16484]: Sending PIN_Code_Reply to Eintrag beschreibt jeweils einen einzigen Serverdienst. Ein Client kann diese Informationen durch eine SDP-Anforderung vom SDP-Server beziehen. Wenn der Client oder eine Anwendung - des Clients einen Dienst nutzen will, muss eine seperate + des Clients einen Dienst nutzen will, muss eine separate Verbindung mit dem Dienstanbieter aufgebaut werden. SDP bietet einen Mechanismus zum Auffinden von Diensten und deren Eigenschaften an, es bietet aber keine Mechanismen zur Verwendung @@ -3028,7 +3113,9 @@ Bluetooth Profile Descriptor List: Das Profil OBEX-Push (OPUSH) - OBEX + + OBEX + OBEX ist ein häufig verwendetes Protokoll für den Dateitransfer zwischen Mobilgeräten. Sein Hauptzweck ist @@ -3143,24 +3230,34 @@ rfcomm_sppd[94692]: Starting on /dev/tty LAN-Kopplung mit einer Bridge - AndrewThompsonGeschrieben von + + + Andrew + Thompson + + Geschrieben von + - + Einführung - Subnetz - Bridge + + Subnetz + + + Bridge + Manchmal ist es nützlich, ein physikalisches Netzwerk (wie ein Ethernetsegment) in zwei separate Netzwerke aufzuteilen, ohne gleich IP-Subnetze zu erzeugen, die über einen Router miteinander verbunden sind. Ein Gerät, das zwei Netze auf diese Weise verbindet, wird als - Bridge bezeichnet. Jedes FreeBSD-System + Bridge bezeichnet. Jedes &os;-System mit zwei Netzwerkkarten kann als Bridge fungieren. Die Bridge arbeitet, indem sie die MAC Layeradressen @@ -3200,8 +3297,12 @@ rfcomm_sppd[94692]: Starting on /dev/tty Filtering/Traffic Shaping Firewall - Firewall - NAT + + Firewall + + + NAT + Häufig kommt es vor, dass Firewallfunktionen benötigt werden, ohne dass Routing oder @@ -3215,9 +3316,15 @@ rfcomm_sppd[94692]: Starting on /dev/tty ist der Einsatz von Subnetzen sowie einer routerbasierten Firewall schwierig. - Router - DSL - ISDN + + Router + + + DSL + + + ISDN + Eine brigdebasierte Firewall kann konfiguriert und in den ISDN/DSL-Downstreampfad ihres Routers eingebunden werden, ohne @@ -3356,7 +3463,9 @@ ifconfig_fxp1="up" Firewalls - firewall + + firewall + Nachdem ein Paketfilter aktiviert wurde, können Datenpakete, die von den Schnittstellen der gekoppelten @@ -3672,162 +3781,214 @@ BEGEMOT-BRIDGE-MIB::begemotBridgeDefault Link-Aggregation und Failover - AndrewThompsonGeschrieben von + + + Andrew + Thompson + + Geschrieben von + - BenedictReuschlingÜbersetzt von - SharonBahagi + + + Benedict + Reuschling + + Übersetzt von + + + + + Sharon + Bahagi + + - - lagg - failover - fec - lacp - loadbalance - roundrobin - - Einleitung - Die &man.lagg.4;-Schnittstelle erlaubt die Aggregation von - mehreren Netzwerkadaptern als eine virtuelle Schnittstelle mit dem - Ziel, Ausfallsicherheit (Failover) und Hochgeschwindigkeitsverbindungen - bereitzustellen. - + + lagg + + + failover + + + fec + + + lacp + + + loadbalance + + + roundrobin + - - Anwendungsoptionen + Die von &os; unterstützte &man.lagg.4;-Schnittstelle + erlaubt die Gruppierung von mehreren Netzwerkadaptern als eine + virtuelle Schnittstelle mit dem Ziel, Ausfallsicherheit + (Failover) und Link Aggregation bereitzustellen. Bei Failover + kann der Verkehr auch dann weiter fließen, wenn nur eine + Schnittstelle verfügbar ist. Link Aggregation funktioniert am + besten mit Switches, welche LACP + unterstützen, da dieses Protokoll den Datenverkehr + bidirektional verteilt, während es auch auf den Ausfall + einzelner Verbindungen reagiert. + + Die von der lagg-Schnittstelle unterstützten Protokolle + bestimmten, welche Ports für den ausgehenden Datenverkehr + benutzt werden, und ob ein bestimmter Port eingehenden + Datenverkehr akzeptiert. Die folgenden Protokolle werden von + &man.lagg.4; unterstützt: - - Ausfallsicherheit (Failover) - - - Sendet und empfängt Netzwerkverkehr nur auf dem - Masterport. Sollte der Masterport nicht zur Verfügung stehen, - wird der nächste aktive Port verwendet. Der zuerst - hinzugefügte Adapter wird zum Masterport, jeder weitere Adapter - dient als Gerät zur Ausfallsicherheit. - + + failover (Ausfallsicherheit) + + Dieser Modus sendet und empfängt Datenverkehr nur + auf dem Masterport. Sollte der Masterport nicht zur + Verfügung stehen, wird der nächste aktive Port + verwendet. Der zuerst hinzugefügte Adapter der + virtuellen Schnittstelle wird zum Masterport, jeder + weitere Adapter dient als Gerät zur Ausfallsicherheit. + Wenn ein Failover auf einem Nicht-Master Port + stattfindet, wird der ursprüngliche Port wieder zum + Master-Port, sobald er wieder verfügbar ist. + - &cisco; Fast ðerchannel; - - - &cisco; Fast ðerchannel; (FEC), ist eine statische - Konfiguration und handelt weder Aggregation mit der Gegenstelle aus, - noch werden Frames zur Überwachung der Verbindung ausgetauscht. - Wenn der Switch LACP unterstützt, sollte diese Option auch - verwendet werden. - - FEC balanciert den ausgehenden Verkehr - über die aktiven Ports, basierend auf gehashten - Protokollheaderinformationen und akzeptiert eingehenden Verkehr auf - jedem aktiven Port. Der Hash enthält die Ethernet-Quell- und - Zieladresse, und, falls verfügbar, den VLAN-Tag, sowie die - IPv4/IPv6 Quell- und Zieladresse. - - - - LACP - - - Das &ieee; 802.3ad Link-Aggregation Control Protokoll - (LACP) und das Marker Protocol. LACP wird eine Menge von - aggregierbaren Verbindungen mit der Gegenstelle in einer oder - mehreren Link Aggregated Groups (LAG) aushandeln. Jede LAG besteht - aus Ports der gleichen Geschwindigkeit, eingestellt auf - Voll-Duplex-Betrieb. Der Verkehr wird über die Ports - in der LAG mit der größten Gesamtgeschwindigkeit - balanciert, in den meisten Fällen wird es nur eine LAG geben, - die alle Ports enthält. Im Falle von Änderungen in der - physischen Anbindung wird die Link-Aggregation schnell zu einer - neuen Konfiguration konvergieren. - - LACP balanciert ausgehenden Verkehr - über die aktiven Ports basierend auf der gehashten - Protokollheaderinformation und akzeptiert eingehenden Verkehr auf - jedem aktiven Port. Der Hash beinhaltet die Ethernet-Quell- und - Zieladresse, und, soweit verfügbar, den VLAN-Tag, sowie die - IPv4/IPv6 Quell- und Zieladresse. - - - - Lastverteilung (Loadbalance) - - - Dabei handelt es sich um einen Alias des - FEC-Modus. - + + fec / loadbalance (Lastverteilung) + + &cisco; Fast ðerchannel; (FEC) + findet sich auf älteren &cisco; Switches. Es bietet + eine statische Konfiguration und handelt weder + Aggregation mit der Gegenstelle aus, noch werden Frames + zur Überwachung der Verbindung ausgetauscht. Wenn der + Switch LACP unterstützt, sollte diese + Option auch verwendet werden. + - Round-Robin + + lacp + + Das &ieee; 802.3ad Link-Aggregation Control + Protokoll (LACP). Mit + LACP wird eine Menge von + aggregierbaren Verbindungen mit der Gegenstelle in einer + oder mehreren Link Aggregated Groups + (LAG) ausgehandelt. Jede + LAG besteht aus Ports der gleichen + Geschwindigkeit, eingestellt auf Voll-Duplex-Betrieb. + Der Verkehr wird über die Ports in der + LAG mit der größten + Gesamtgeschwindigkeit balanciert. Typischerweise gibt + es nur eine LAG, die alle Ports + enthält. Im Falle von Änderungen in der physischen + Anbindung wird LACP schnell zu einer + neuen Konfiguration konvergieren. + + LACP balanciert ausgehenden + Verkehr über die aktiven Ports basierend auf der + gehashten Protokollheaderinformation und akzeptiert + eingehenden Verkehr auf jedem aktiven Port. Der Hash + beinhaltet die Ethernet-Quell- und Zieladresse, und, + soweit verfügbar, den VLAN-Tag, + sowie die IPv4 oder + IPv6 Quell- und Zieladresse. + + - - Verteilt ausgehenden Verkehr mittels einer Round-Robin-Zuteilung - über alle aktiven Ports und akzeptiert eingehenden Verkehr auf - jedem aktiven Port. Dieser Modus verletzt die Reihenfolge von - Ethernet-Frames und sollte mit Vorsicht eingesetzt werden. - - + + roundrobin + + Dieser Modus verteilt ausgehenden Verkehr mittels + einer Round-Robin-Zuteilung über alle aktiven Ports und + akzeptiert eingehenden Verkehr auf jedem aktiven Port. + Da dieser Modus die Reihenfolge von Ethernet-Frames + verletzt, sollte er mit Vorsicht eingesetzt + werden. + + - Beispiele + Dieser Abschnitt zeigt, wie man einen &cisco; Switch und + ein &os;-System für LACP Load Balancing + konfiguriert. Weiterhin wird gezeigt, wie man zwei + Ethernet-Schnittstellen, sowie eine Ethernet- und eine + Drahtlos-Schnittstelle für den Failover-Modus konfigurieren + kann. + - LACP Aggregation mit einem Switch von &cisco; + <acronym>LACP</acronym> Aggregation mit einem Switch + von &cisco; - Dieses Beispiel verbindet zwei Adapter auf einer &os;-Maschine - mit dem Switch als eine einzelne, lastverteilte und ausfallsichere - Verbindung. Weitere Adapter können hinzugefügt werden, um - den Durchsatz zu erhöhen und die Ausfallsicherheit zu steigern. - Da die Reihenfolge der Frames bei Ethernet zwingend eingehalten - werden muss, fließt auch jeglicher Verkehr zwischen zwei - Stationen über den gleichen physischen Kanal, was die maximale - Geschwindigkeit der Verbindung auf die eines einzelnen Adapters - beschränkt. Der Übertragungsalgorithmus versucht, so viele - Informationen wie möglich zu verwenden, um die verschiedenen - Verkehrsflüsse zu unterscheiden und balanciert diese über - die verfügbaren Adapter. + Dieses Beispiel verbindet zwei &man.fxp.4; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***