Deleted Added
full compact
32,35c32,35
< .\" @(#)restore.8 8.2 (Berkeley) 12/11/93
< .\" $Id$
< .\" "
< .Dd December 11, 1993
---
> .\" @(#)restore.8 8.4 (Berkeley) 5/1/95
> .\" $Id: restore.8,v 1.9 1997/02/22 14:33:08 peter Exp $
> .\"
> .Dd May 1, 1995
43,44c43,79
< .Ar key
< .Op Ar name Ar ...
---
> .Fl i
> .Op Fl chmvy
> .Op Fl b Ar blocksize
> .Op Fl f Ar file
> .Op Fl s Ar fileno
> .Nm restore
> .Fl R
> .Op Fl cvy
> .Op Fl b Ar blocksize
> .Op Fl f Ar file
> .Op Fl s Ar fileno
> .Nm restore
> .Fl r
> .Op Fl cvy
> .Op Fl b Ar blocksize
> .Op Fl f Ar file
> .Op Fl s Ar fileno
> .Nm restore
> .Fl t
> .Op Fl chvy
> .Op Fl b Ar blocksize
> .Op Fl f Ar file
> .Op Fl s Ar fileno
> .Op file ...
> .Nm restore
> .Fl x
> .Op Fl chmvy
> .Op Fl b Ar blocksize
> .Op Fl f Ar file
> .Op Fl s Ar fileno
> .Op file ...
> .Pp
> .in -\\n(iSu
> (The
> .Bx 4.3
> option syntax is implemented for backward compatibility, but
> is not documented here.)
60,68d94
< The actions
< of
< .Nm restore
< are controlled by the given
< .Cm key ,
< which
< is a string of characters containing
< at most one function letter and possibly
< one or more function modifiers.
72,73c98,99
< .Cm h
< key is specified (see below),
---
> .Fl h
> flag is specified (see below),
77,78c103
< The function portion of
< the key is specified by one of the following letters:
---
> Exactly one of the following flags is required:
80,162c105
< .It Cm r
< Restore (rebuild a file system).
< The target file system should be made pristine with
< .Xr newfs 8 ,
< mounted and the
< user
< .Xr cd Ns 'd
< into the pristine file system
< before starting the restoration of the initial level 0 backup. If the
< level 0 restores successfully, the
< .Cm r
< key may be used to restore
< any necessary incremental backups on top of the level 0.
< The
< .Cm r
< key precludes an interactive file extraction and can be
< detrimental to one's health if not used carefully (not to mention
< the disk). An example:
< .Bd -literal -offset indent
< newfs /dev/rrp0g eagle
< mount /dev/rp0g /mnt
< cd /mnt
<
< restore rf /dev/rst8
< .Ed
< .Pp
< Note that
< .Nm restore
< leaves a file
< .Pa restoresymtable
< in the root directory to pass information between incremental
< restore passes.
< This file should be removed when the last incremental has been
< restored.
< .Pp
< .Nm Restore ,
< in conjunction with
< .Xr newfs 8
< and
< .Xr dump 8 ,
< may be used to modify file system parameters
< such as size or block size.
< .It Cm R
< .Nm Restore
< requests a particular tape of a multi volume set on which to restart
< a full restore
< (see the
< .Cm r
< key above).
< This is useful if the restore has been interrupted.
< .It Cm x
< The named files are read from the given media.
< If a named file matches a directory whose contents
< are on the backup
< and the
< .Cm h
< key is not specified,
< the directory is recursively extracted.
< The owner, modification time,
< and mode are restored (if possible).
< If no file argument is given,
< then the root directory is extracted,
< which results in the entire content of the
< backup being extracted,
< unless the
< .Cm h
< key has been specified.
< .It Cm t
< The names of the specified files are listed if they occur
< on the backup.
< If no file argument is given,
< then the root directory is listed,
< which results in the entire content of the
< backup being listed,
< unless the
< .Cm h
< key has been specified.
< Note that the
< .Cm t
< key replaces the function of the old
< .Xr dumpdir 8
< program.
< .It Cm i
---
> .It Fl i
178,179c121,122
< .Cm h
< key is specified on the command line).
---
> .Fl h
> flag is specified on the command line).
191,192c134,135
< .Cm h
< key is specified on the command line).
---
> .Fl h
> flag is specified on the command line).
209c152,153
< If the verbose key is set the inode number of each entry is also listed.
---
> If the verbose
> flag is set the inode number of each entry is also listed.
222,224c166,168
< .Cm v
< key is toggled.
< When set, the verbose key causes the
---
> .Fl v
> flag is toggled.
> When set, the verbose flag causes the
230a175,256
> .It Fl R
> .Nm Restore
> requests a particular tape of a multi volume set on which to restart
> a full restore
> (see the
> .Fl r
> flag below).
> This is useful if the restore has been interrupted.
> .It Fl r
> Restore (rebuild a file system).
> The target file system should be made pristine with
> .Xr newfs 8 ,
> mounted and the user
> .Xr cd Ns 'd
> into the pristine file system
> before starting the restoration of the initial level 0 backup. If the
> level 0 restores successfully, the
> .Fl r
> flag may be used to restore
> any necessary incremental backups on top of the level 0.
> The
> .Fl r
> flag precludes an interactive file extraction and can be
> detrimental to one's health if not used carefully (not to mention
> the disk). An example:
> .Bd -literal -offset indent
> newfs /dev/rrp0g eagle
> mount /dev/rp0g /mnt
> cd /mnt
>
> restore rf /dev/rst8
> .Ed
> .Pp
> Note that
> .Nm restore
> leaves a file
> .Pa restoresymtable
> in the root directory to pass information between incremental
> restore passes.
> This file should be removed when the last incremental has been
> restored.
> .Pp
> .Nm Restore ,
> in conjunction with
> .Xr newfs 8
> and
> .Xr dump 8 ,
> may be used to modify file system parameters
> such as size or block size.
> .It Fl t
> The names of the specified files are listed if they occur
> on the backup.
> If no file argument is given,
> then the root directory is listed,
> which results in the entire content of the
> backup being listed,
> unless the
> .Fl h
> flag has been specified.
> Note that the
> .Fl t
> flag replaces the function of the old
> .Xr dumpdir 8
> program.
> .ne 1i
> .It Fl x
> The named files are read from the given media.
> If a named file matches a directory whose contents
> are on the backup
> and the
> .Fl h
> flag is not specified,
> the directory is recursively extracted.
> The owner, modification time,
> and mode are restored (if possible).
> If no file argument is given,
> then the root directory is extracted,
> which results in the entire content of the
> backup being extracted,
> unless the
> .Fl h
> flag has been specified.
233,234c259
< The following characters may be used in addition to the letter
< that selects the function desired.
---
> The following additional options may be specified:
236,239c261,262
< .It Cm b
< The next argument to
< .Nm restore
< is used as the block size of the media (in kilobytes).
---
> .It Fl b Ar blocksize
> The number of kilobytes per dump record.
245,246c268,269
< .It Cm f
< The next argument to
---
> .It Fl c
> Normally,
248,250c271,289
< is used as the name of the archive instead
< of
< .Pa /dev/rst0 .
---
> will try to determine dynamically whether the dump was made from an
> old (pre-4.4) or new format file sytem. The
> .Fl c
> flag disables this check, and only allows reading a dump in the old
> format.
> .It Fl f Ar file
> Read the backup from
> .Ar file ;
> .Ar file
> may be a special device file
> like
> .Pa /dev/rmt12
> (a tape drive),
> .Pa /dev/rsd1c
> (a disk drive),
> an ordinary file,
> or
> .Ql Fl
> (the standard input).
252a292,293
> or
> .Dq user@host:file ,
256,268d296
< If the name of the file is
< .Ql Fl ,
< .Nm restore
< reads from standard input.
< Thus,
< .Xr dump 8
< and
< .Nm restore
< can be used in a pipeline to dump and restore a file system
< with the command
< .Bd -literal -offset indent
< dump 0f - /usr | (cd /mnt; restore xf -)
< .Ed
270,272c298,299
< .It Cm h
< .Nm Restore
< extracts the actual directory,
---
> .It Fl h
> Extract the actual directory,
276,278c303,304
< .It Cm m
< .Nm Restore
< will extract by inode numbers rather than by file name.
---
> .It Fl m
> Extract by inode numbers rather than by file name.
282,288c308,313
< .It Cm s
< The next argument to
< .Nm restore
< is a number which
< selects the file on a multi-file dump tape. File numbering
< starts at 1.
< .It Cm v
---
> .It Fl s Ar fileno
> Read from the specified
> .Ar fileno
> on a multi-file tape.
> File numbering starts at 1.
> .It Fl v
293c318
< .Cm v
---
> .Fl v
295c320
< key causes it to type the name of each file it treats
---
> flag causes it to type the name of each file it treats
297,301c322,324
< .It Cm y
< .Nm Restore
< will not ask whether it should abort the restore if it gets an error.
< It will always try to skip over the bad block(s) and continue as
< best it can.
---
> .It Fl y
> Do not ask the user whether to abort the restore in the event of an error.
> Always try to skip over the bad block(s) and continue.
304,305d326
< Complaints about bad key characters.
< .Pp
308c329
< .Cm y
---
> .Fl y
318c339
< .Cm x
---
> .Fl x
320,321c341,342
< .Cm i
< key has been specified,
---
> .Fl i
> flag has been specified,
394c415
< dump that were made on active file systems.
---
> dumps that were made on active file systems.