amanda-plugin-dumpext: comparison bin/amdumpext

equal deleted inserted replaced

-:9e30f40ffb34
+:4e072a6ae1f3
 use Pod::Usage;
 use Getopt::Long;
 use File::Basename;
 use POSIX;
-#use Readonly;
 our $VERSION = '0.01';
 my $ME = basename $0;
 # to avoid stupid "not found"
 $ENV{PATH} .= ':/usr/local/sbin:/usr/sbin:/sbin';
 CLIENT_ESTIMATE => YES,    # estimate
 MULTI_ESTIMATE  => YES,    # estimate for multiple levels
 CALCSIZE        => NO,     # estimate --calcsize
 #
 RECORD          => YES,    # --record
+COLLECTION	    => NO,
 );
 sub exec_support;
 sub exec_selfcheck;
 sub exec_estimate;
 sub exec_backup;
 sub exec_validate;
+sub exec_restore;
 # some helper functions
 sub device;
 sub OK;
 my @opt_level;      # 0…99
 my $opt_dumpdates;
 MAIN: {
-my @argv = @ARGV;
 my $command = shift // pod2usage;
+#warn "<<< $command | @ARGV >>>\n";
 GetOptions(
 'config=s'    => \$opt_config,
 'device=s'    => \$opt_device,       # --device $device
 'message=s'   => \$opt_message,      # --message line|xml
 'index=s'     => \$opt_index,        # --index line
 'host=s'      => sub { },            # ignore
 'disk=s'      => sub { },            # ignore
 ) or pod2usage;
 given ($command) {
-when ('support') { exec_support }
+when ('support')  { exec_support }
+when ('validate') { exec_validate }
+when ('restore')  { exec_restore @ARGV }
 when ('selfcheck') {
 pod2usage if undef ~~ $opt_device;
-exec_selfcheck
+exec_selfcheck;
 }
 when ('estimate') {
 pod2usage if undef ~~ [$opt_device, $opt_level[0]];
-exec_estimate
+exec_estimate;
 }
 when ('backup') {
 pod2usage if undef ~~ [$opt_device, $opt_level[0]];
-exec_backup
+exec_backup;
-}
-when ('validate') {
-exec_validate
 }
 default { pod2usage }
 }
 }
 sub exec_validate {
 my $pid = fork // die "Can't fork: $!\n";
 open(STDOUT, '>', '/dev/null')
-	or die "Can't redirect STDOUT to /dev/null: $!\n";
+or die "Can't redirect STDOUT to /dev/null: $!\n";
 # the first part goes into restore
 # but restore stops reading after the directory
 if (not $pid) {
 exec 'restore', '-tf', '-';
 # nobody is fast than cat
 exec 'cat';
 die "Can't exec `cat': $!\n";
 }
+sub exec_restore {
+if (not @_ or $_[0] eq '.') {
+	# complete file system restore
+	exec 'restore', '-yrf', '-';
+}
+# just some files - in this mode
+# no true incremental restore can be done
+# (it will just add new files or do updates, but it
+# won't remove any files!)
+exec 'restore', '-yxf', '-', @_;
+}
 sub device {
 my $_ = shift;
 return $_ if /^\//;
 return "/dev/$_";
 }
 amdumpext - the amanda dump application
 =head1 SYNOPSIS
-amdumpext support
+amdumpext support   [options]
 amdumpext selfcheck [options] [--level <level>] --device <device>
 amdumpext backup    [options] [--level <level>] --device <device>
 amdumpext estimate  [options] [--level <level>]... --device <device>
-amdumpext validate
+amdumpext validate  [options]
+amdumpext restore   [options]
 =head1 DESCRIPTION
 The B<amdumpext> is an application plugin for amanda. It drives the
 native ext2/3/4 dump/restore programs found on most Linux systems. See L<dump(8)>
 and L<restore(8)> for more information on these tools.
+=head1 OPTIONS
+The commands may need some options. These options are noted per command.
+Unsupported options are silently ignored. Unknown options are not
+allowed.
+=over
+=item B<--device> I<device>
+The disk device from the disklist.
+=item B<--disk> I<disk>
+The diskname from the disklist. Currently ignored.
+=item B<--host> I<host>
+The hostname from the disklist. Currently ignored.
+=item B<--config> I<config>
+The name of the configuration.
+=item B<--level> I<level>
+The level of the backup. 0 means full backup.
+=item B<--index> I<xml|line>
+Create an index of the files backed up. XML is not supported yet.
+(Default: not set, means no index at all)
+=item B<--message> I<xml|line>
+The format used for messages. XML is not supported yet.
+(Default: line)
+=back
+=head1 PROPERTIES
+The properties may be set on the server side to tune the behaviour
+of the application. Currently property setting on the client side is
+not supported.
+=over 4
+=item B<--dumpdates> I<dumpdates>
+The location of the dumpdates file. Placeholder "${c}" is allowed and
+replaced by the name of the current config.
+=back
 =head1 COMMANDS
 The B<amdumpext> supports the commands from the API description found on
 L<http://wiki.zmanda.com/index.php/Application_API/Operations>.
-=head1 COMMON OPTIONS
-=over
-=item B<--device> I<device>
-The disk device from the disklist.
-=item B<--disk> I<disk>
-The diskname from the disklist. Currently ignored.
-=item B<--host> I<host>
-The hostname from the disklist. Currently ignored.
-=item B<--config> I<config>
-The name of the configuration.
-=item B<--level> I<level>
-The level of the backup. 0 means full backup.
-=item B<--index> I<xml|line>
-Create an index of the files backed up. XML is not supported yet.
-(Default: not set, means no index at all)
-=item B<--message> I<xml|line>
-The format used for messages. XML is not supported yet.
-(Default: line)
-=back
-=head1 COMMANDS
 =head2 support
 This command returns the list of supported features.
 This checks if the data stream is readable and looks like a dump.
 Actually it does not try to completly validate the stream, as B<restore>
 does not have such an option.
-=head1 PROPERTIES
+=head2 restore
-The properties may be set on the server side to tune the behaviour
+Restore from a single dump.
-of the application. Currently property setting on the client side is
-not supported.
-=over 4
-=item B<--dumpdates> I<dumpdates>
-The location of the dumpdates file. Placeholder "${c}" is allowed and
-replaced by the name of the current config.
-=back
 =head1 TESTING
 The B<amdumpext> may be tested on the command line. The following output
 file descriptors are used:

changeset 13	4e072a6ae1f3
parent 12	9e30f40ffb34
child 14	d9b06b08b28d