From owner-svn-doc-head@freebsd.org Mon Aug 28 17:37:11 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D380AE10DB0; Mon, 28 Aug 2017 17:37:11 +0000 (UTC) (envelope-from bhd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 A3087820B0; Mon, 28 Aug 2017 17:37:11 +0000 (UTC) (envelope-from bhd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7SHbAQf055937; Mon, 28 Aug 2017 17:37:10 GMT (envelope-from bhd@FreeBSD.org) Received: (from bhd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7SHbAOa055936; Mon, 28 Aug 2017 17:37:10 GMT (envelope-from bhd@FreeBSD.org) Message-Id: <201708281737.v7SHbAOa055936@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org using -f From: Bjoern Heidotting Date: Mon, 28 Aug 2017 17:37:10 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50758 - head/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-head X-SVN-Commit-Author: bhd X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/handbook/zfs X-SVN-Commit-Revision: 50758 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Aug 2017 17:37:12 -0000 Author: bhd Date: Mon Aug 28 17:37:10 2017 New Revision: 50758 URL: https://svnweb.freebsd.org/changeset/doc/50758 Log: - Add missing quote in 'zfs set sharenfs' command - Use root prompt in various places to reflect reality - Add missing tags - Remove a useless 'zfs list' command - Use sysrc instead of echo command Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D12127 Modified: head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Mon Aug 28 08:31:59 2017 (r50757) +++ head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Mon Aug 28 17:37:10 2017 (r50758) @@ -1911,7 +1911,7 @@ tank custom:costcenter - - . To set additional options to a dataset shared through NFS, enter: - &prompt.root; zfs set sharenfs="-alldirs,-maproot=root,-network=192.168.1.0/24 mypool/usr/home + &prompt.root; zfs set sharenfs="-alldirs,-maproot=root,-network=192.168.1.0/24" mypool/usr/home @@ -2178,12 +2178,11 @@ mypool/var/tmp 262K 93.2G 1 mypool/var/tmp@my_recursive_snapshot 88K - 152K - mypool/var/tmp@after_cp 53.5K - 118K - mypool/var/tmp@diff_snapshot 0 - 120K - -&prompt.user; ls /var/tmp -passwd passwd.copy -&prompt.user; rm /var/tmp/passwd* -&prompt.user; ls /var/tmp -vi.recover -&prompt.user; +&prompt.root; ls /var/tmp +passwd passwd.copy vi.recover +&prompt.root; rm /var/tmp/passwd* +&prompt.root; ls /var/tmp +vi.recover At this point, the user realized that too many files were deleted and wants them back. ZFS @@ -2193,7 +2192,7 @@ vi.recover the last snapshot, issue the command: &prompt.root; zfs rollback mypool/var/tmp@diff_snapshot -&prompt.user; ls /var/tmp +&prompt.root; ls /var/tmp passwd passwd.copy vi.recover The rollback operation restored the dataset to the state @@ -2229,7 +2228,7 @@ mypool/var/tmp@diff_snapshot &prompt.root; zfs list -rt snapshot mypool/var/tmp NAME USED AVAIL REFER MOUNTPOINT mypool/var/tmp@my_recursive_snapshot 8K - 152K - -&prompt.user; ls /var/tmp +&prompt.root; ls /var/tmp vi.recover The output from zfs list -t snapshot @@ -2257,10 +2256,10 @@ vi.recover &prompt.root; zfs get snapdir mypool/var/tmp NAME PROPERTY VALUE SOURCE mypool/var/tmp snapdir hidden default -&prompt.user; ls -a /var/tmp +&prompt.root; ls -a /var/tmp . .. passwd vi.recover &prompt.root; zfs set snapdir=visible mypool/var/tmp -&prompt.user; ls -a /var/tmp +&prompt.root; ls -a /var/tmp . .. .zfs passwd vi.recover Individual files can easily be restored to a previous @@ -2275,7 +2274,7 @@ mypool/var/tmp snapdir hidden default file: &prompt.root; rm /var/tmp/passwd -&prompt.user; ls -a /var/tmp +&prompt.root; ls -a /var/tmp . .. .zfs vi.recover &prompt.root; ls /var/tmp/.zfs/snapshot after_cp my_recursive_snapshot @@ -2640,7 +2639,7 @@ mypool@replica2 0 On the sending system: - &prompt.root; zfs allow -u someuser send,snapshot mypool + &prompt.root; zfs allow -u someuser send,snapshot mypool @@ -2648,12 +2647,12 @@ mypool@replica2 0 the directory, and regular users must be allowed to mount file systems. On the receiving system: - &prompt.root; sysctl vfs.usermount=1 + &prompt.root; sysctl vfs.usermount=1 vfs.usermount: 0 -> 1 -&prompt.root; echo vfs.usermount=1 >> /etc/sysctl.conf +&prompt.root; sysrc -f /etc/sysctl.conf vfs.usermount=1 &prompt.root; zfs create recvpool/backup &prompt.root; zfs allow -u someuser create,mount,receive recvpool/backup -&prompt.root; chown someuser /recvpool/backup +&prompt.root; chown someuser /recvpool/backup @@ -2941,10 +2940,9 @@ pool 2.84G 2.19M 2.83G 0% 1.00x ONLINE - copied three times into different directories on the deduplicated pool created above. - &prompt.root; zpool list -for d in dir1 dir2 dir3; do -for> mkdir $d && cp -R /usr/ports $d & -for> done + &prompt.root; for d in dir1 dir2 dir3; do +> mkdir $d && cp -R /usr/ports $d & +> done Redundant data is detected and deduplicated: