Index: zfs/chapter.xml =================================================================== --- zfs/chapter.xml +++ zfs/chapter.xml @@ -1893,14 +1893,12 @@ current status of a share, enter: &prompt.root; zfs get sharenfs mypool/usr/home - NAME PROPERTY VALUE SOURCE - mypool/usr/home sharenfs on local +NAME PROPERTY VALUE SOURCE +mypool/usr/home sharenfs on local +&prompt.root; zfs get sharesmb mypool/usr/home +NAME PROPERTY VALUE SOURCE +mypool/usr/home sharesmb off local - &prompt.root; zfs get sharesmb mypool/usr/home - - NAME PROPERTY VALUE SOURCE - mypool/usr/home sharesmb off local - To enable sharing of a dataset, enter: &prompt.root; zfs set sharenfs=on mypool/usr/home @@ -1911,7 +1909,7 @@ . 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 +2176,11 @@ 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 +&prompt.root; ls /var/tmp passwd passwd.copy -&prompt.user; rm /var/tmp/passwd* -&prompt.user; ls /var/tmp -vi.recover -&prompt.user; +&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 +2190,7 @@ 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 +2226,7 @@ &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 +2254,10 @@ &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 +2272,7 @@ 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 +2637,7 @@ On the sending system: - &prompt.root; zfs allow -u someuser send,snapshot mypool + &prompt.root; zfs allow -u someuser send,snapshot mypool @@ -2648,12 +2645,12 @@ 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; echo vfs.usermount=1 >> /etc/sysctl.conf &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 +2938,9 @@ 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: