- Add missing quote in 'zfs set sharenfs' command
- Use root prompt in various places to reflect reality - Add missing <userinput> tags - Remove a useless 'zfs list' command - Use sysrc instead of echo command Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D12127
This commit is contained in:
parent
9816bba318
commit
7a4711094b
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=50758
1 changed files with 18 additions and 20 deletions
|
@ -1911,7 +1911,7 @@ tank custom:costcenter - -
|
|||
<option>-network</option>. To set additional options to a
|
||||
dataset shared through NFS, enter:</para>
|
||||
|
||||
<screen>&prompt.root; <userinput> zfs set sharenfs="-alldirs,-maproot=<replaceable>root</replaceable>,-network=<replaceable>192.168.1.0/24</replaceable> <replaceable>mypool/usr/home</replaceable></userinput></screen>
|
||||
<screen>&prompt.root; <userinput> zfs set sharenfs="-alldirs,-maproot=<replaceable>root</replaceable>,-network=<replaceable>192.168.1.0/24</replaceable>" <replaceable>mypool/usr/home</replaceable></userinput></screen>
|
||||
</sect3>
|
||||
</sect2>
|
||||
|
||||
|
@ -2178,12 +2178,11 @@ mypool/var/tmp 262K 93.2G 120K /var/tmp
|
|||
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; <userinput>ls /var/tmp</userinput>
|
||||
passwd passwd.copy
|
||||
&prompt.user; <userinput>rm /var/tmp/passwd*</userinput>
|
||||
&prompt.user; <userinput>ls /var/tmp</userinput>
|
||||
vi.recover
|
||||
&prompt.user;</screen>
|
||||
&prompt.root; <userinput>ls /var/tmp</userinput>
|
||||
passwd passwd.copy vi.recover
|
||||
&prompt.root; <userinput>rm /var/tmp/passwd*</userinput>
|
||||
&prompt.root; <userinput>ls /var/tmp</userinput>
|
||||
vi.recover</screen>
|
||||
|
||||
<para>At this point, the user realized that too many files
|
||||
were deleted and wants them back. <acronym>ZFS</acronym>
|
||||
|
@ -2193,7 +2192,7 @@ vi.recover
|
|||
the last snapshot, issue the command:</para>
|
||||
|
||||
<screen>&prompt.root; <userinput>zfs rollback <replaceable>mypool/var/tmp@diff_snapshot</replaceable></userinput>
|
||||
&prompt.user; <userinput>ls /var/tmp</userinput>
|
||||
&prompt.root; <userinput>ls /var/tmp</userinput>
|
||||
passwd passwd.copy vi.recover</screen>
|
||||
|
||||
<para>The rollback operation restored the dataset to the state
|
||||
|
@ -2229,7 +2228,7 @@ mypool/var/tmp@diff_snapshot</screen>
|
|||
&prompt.root; <userinput>zfs list -rt snapshot <replaceable>mypool/var/tmp</replaceable></userinput>
|
||||
NAME USED AVAIL REFER MOUNTPOINT
|
||||
mypool/var/tmp@my_recursive_snapshot 8K - 152K -
|
||||
&prompt.user; <userinput>ls /var/tmp</userinput>
|
||||
&prompt.root; <userinput>ls /var/tmp</userinput>
|
||||
vi.recover</screen>
|
||||
|
||||
<para>The output from <command>zfs list -t snapshot</command>
|
||||
|
@ -2257,10 +2256,10 @@ vi.recover</screen>
|
|||
<screen>&prompt.root; <userinput>zfs get snapdir <replaceable>mypool/var/tmp</replaceable></userinput>
|
||||
NAME PROPERTY VALUE SOURCE
|
||||
mypool/var/tmp snapdir hidden default
|
||||
&prompt.user; <userinput>ls -a /var/tmp</userinput>
|
||||
&prompt.root; <userinput>ls -a /var/tmp</userinput>
|
||||
. .. passwd vi.recover
|
||||
&prompt.root; <userinput>zfs set snapdir=visible <replaceable>mypool/var/tmp</replaceable></userinput>
|
||||
&prompt.user; <userinput>ls -a /var/tmp</userinput>
|
||||
&prompt.root; <userinput>ls -a /var/tmp</userinput>
|
||||
. .. .zfs passwd vi.recover</screen>
|
||||
|
||||
<para>Individual files can easily be restored to a previous
|
||||
|
@ -2275,7 +2274,7 @@ mypool/var/tmp snapdir hidden default
|
|||
file:</para>
|
||||
|
||||
<screen>&prompt.root; <userinput>rm /var/tmp/passwd</userinput>
|
||||
&prompt.user; <userinput>ls -a /var/tmp</userinput>
|
||||
&prompt.root; <userinput>ls -a /var/tmp</userinput>
|
||||
. .. .zfs vi.recover
|
||||
&prompt.root; <userinput>ls /var/tmp/.zfs/snapshot</userinput>
|
||||
after_cp my_recursive_snapshot
|
||||
|
@ -2640,7 +2639,7 @@ mypool@replica2 0 - 55.0M -</screen>
|
|||
<listitem>
|
||||
<para>On the sending system:</para>
|
||||
|
||||
<screen>&prompt.root; <command>zfs allow -u someuser send,snapshot <replaceable>mypool</replaceable></command></screen>
|
||||
<screen>&prompt.root; <userinput>zfs allow -u someuser send,snapshot <replaceable>mypool</replaceable></userinput></screen>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -2648,12 +2647,12 @@ mypool@replica2 0 - 55.0M -</screen>
|
|||
the directory, and regular users must be allowed to
|
||||
mount file systems. On the receiving system:</para>
|
||||
|
||||
<screen>&prompt.root; sysctl vfs.usermount=1
|
||||
<screen>&prompt.root; <userinput>sysctl vfs.usermount=1</userinput>
|
||||
vfs.usermount: 0 -> 1
|
||||
&prompt.root; echo vfs.usermount=1 >> /etc/sysctl.conf
|
||||
&prompt.root; <userinput>sysrc -f /etc/sysctl.conf vfs.usermount=1</userinput>
|
||||
&prompt.root; <userinput>zfs create <replaceable>recvpool/backup</replaceable></userinput>
|
||||
&prompt.root; <userinput>zfs allow -u <replaceable>someuser</replaceable> create,mount,receive <replaceable>recvpool/backup</replaceable></userinput>
|
||||
&prompt.root; chown <replaceable>someuser</replaceable> <replaceable>/recvpool/backup</replaceable></screen>
|
||||
&prompt.root; <userinput>chown <replaceable>someuser</replaceable> <replaceable>/recvpool/backup</replaceable></userinput></screen>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
||||
|
@ -2941,10 +2940,9 @@ pool 2.84G 2.19M 2.83G 0% 1.00x ONLINE -</screen>
|
|||
copied three times into different directories on the
|
||||
deduplicated pool created above.</para>
|
||||
|
||||
<screen>&prompt.root; <userinput>zpool list</userinput>
|
||||
for d in dir1 dir2 dir3; do
|
||||
for> mkdir $d && cp -R /usr/ports $d &
|
||||
for> done</screen>
|
||||
<screen>&prompt.root; <userinput>for d in dir1 dir2 dir3; do</userinput>
|
||||
> <userinput>mkdir $d && cp -R /usr/ports $d &</userinput>
|
||||
> <userinput>done</userinput></screen>
|
||||
|
||||
<para>Redundant data is detected and deduplicated:</para>
|
||||
|
||||
|
|
Loading…
Reference in a new issue