From d74dc4d908fcbc1a4ef474edaf51e61ec90eab6b Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 18 Apr 2009 12:05:26 -0600 Subject: [PATCH] Imported Upstream version 2.6.1p1 --- ChangeLog | 201 ++++++++++++++++++++ NEWS | 13 ++ amandad-src/amandad.c | 2 +- amandad-src/amandad_util.c | 12 +- amplot/amplot.awk | 12 +- application-src/amgtar.c | 6 +- autogen | 2 +- changer-src/chg-glue.pl | 54 +++++- changer-src/chg-manual.sh | 6 +- changer-src/chg-rait.sh | 17 +- changer-src/scsi-changer-driver.c | 2 +- client-src/client_util.c | 2 +- client-src/sendbackup.c | 4 +- common-src/Makefile.am | 2 +- common-src/Makefile.in | 2 +- common-src/amfeatures.c | 18 +- common-src/conffile.c | 14 +- common-src/dgram.c | 17 ++ common-src/event.c | 6 +- common-src/genversion.h | 3 - common-src/svn-info.h | 2 +- common-src/util.c | 7 +- common-src/versuff.c | 6 +- config/amanda/dumpers.m4 | 4 +- config/config.guess | 154 ++++++++------- config/config.sub | 119 ++++++++---- configure | 6 +- configure.in | 2 +- device-src/amtapetype.pl | 28 ++- device-src/rait-device.c | 8 +- device-src/s3-device.c | 29 ++- device-src/s3.c | 73 +++++-- device-src/vfs-device.c | 92 +-------- installcheck/Amanda_Changer_compat.pl | 39 +++- man/amaddclient.8 | 172 ++--------------- man/amadmin.8 | 176 ++--------------- man/amaespipe.8 | 168 +--------------- man/amanda-applications.7 | 166 +--------------- man/amanda-archive-format.5 | 164 +--------------- man/amanda-auth.7 | 168 +--------------- man/amanda-changers.7 | 196 +++---------------- man/amanda-client.conf.5 | 168 +--------------- man/amanda-devices.7 | 168 +--------------- man/amanda-scripts.7 | 166 +--------------- man/amanda.8 | 230 ++++------------------ man/amanda.conf.5 | 257 +++++-------------------- man/amarchiver.8 | 170 +---------------- man/amcheck.8 | 182 ++---------------- man/amcheckdb.8 | 166 +--------------- man/amcheckdump.8 | 170 +---------------- man/amcleanup.8 | 168 +--------------- man/amcrypt-ossl-asym.8 | 170 +---------------- man/amcrypt-ossl.8 | 170 +---------------- man/amcrypt.8 | 172 ++--------------- man/amcryptsimple.8 | 170 +---------------- man/amdevcheck.8 | 168 +--------------- man/amdump.8 | 166 +--------------- man/amfetchdump.8 | 170 +---------------- man/amflush.8 | 168 +--------------- man/amgetconf.8 | 264 ++++++-------------------- man/amgpgcrypt.8 | 174 ++--------------- man/amgtar.8 | 166 +--------------- man/amlabel.8 | 166 +--------------- man/amoverview.8 | 168 +--------------- man/amplot.8 | 166 +--------------- man/amrecover.8 | 196 +------------------ man/amreport.8 | 180 +----------------- man/amrestore.8 | 238 +---------------------- man/amrmtape.8 | 168 +--------------- man/amsamba.8 | 164 +--------------- man/amserverconfig.8 | 172 ++--------------- man/amservice.8 | 168 +--------------- man/amstar.8 | 166 +--------------- man/amstatus.8 | 166 +--------------- man/amtape.8 | 166 +--------------- man/amtapetype.8 | 186 +----------------- man/amtoc.8 | 166 +--------------- man/amvault.8 | 168 +--------------- man/amzfs-sendrecv.8 | 164 +--------------- man/amzfs-snapshot.8 | 166 +--------------- man/disklist.5 | 172 ++--------------- man/script-email.8 | 166 +--------------- man/tapelist.5 | 164 +--------------- man/xml-source/amanda.conf.5.xml | 15 +- oldrecover-src/set_commands.c | 2 +- packaging/deb/buildpkg | 2 +- packaging/deb/changelog | 2 +- packaging/deb/rules | 2 +- packaging/rpm/amanda.spec | 117 ++++-------- packaging/rpm/buildpkg | 2 +- perl/Amanda/Changer.pm | 28 ++- perl/Amanda/Changer/compat.pm | 116 +++++++---- perl/Amanda/Changer/disk.pm | 4 + perl/Amanda/Changer/single.pm | 4 + perl/Amanda/Paths.pm.in | 2 + recover-src/amrecover.c | 8 +- recover-src/extract_list.c | 2 +- recover-src/set_commands.c | 2 +- restore-src/amfetchdump.c | 3 - server-src/amcheck.c | 12 +- server-src/amcheckdump.pl | 15 +- server-src/amindexd.c | 6 +- server-src/amlabel.c | 1 + server-src/amserverconfig.pl | 2 +- server-src/amstatus.pl | 36 +++- server-src/chunker.c | 4 + server-src/driver.c | 18 +- server-src/driverio.c | 6 +- server-src/dumper.c | 18 +- server-src/find.c | 5 +- server-src/planner.c | 9 +- server-src/reporter.c | 4 +- server-src/taper-source.c | 2 +- server-src/taper.c | 8 +- xfer-src/Makefile.am | 1 + xfer-src/Makefile.in | 6 +- 116 files changed, 1529 insertions(+), 8548 deletions(-) delete mode 100644 common-src/genversion.h diff --git a/ChangeLog b/ChangeLog index a37ffb6..4e2d0e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,204 @@ +2009-04-10 Dustin J. Mitchell + * common-src/conffile.c: fix handling of double-backslash in quoted + strings + +2009-04-09 Jean-Louis Martineau + * server-src/dumper.c: Check authopt before using it. + +2009-04-07 Jean-Louis Martineau + * client-drc/sendbackup.c: Init result. + +2009-04-07 Jean-Louis Martineau + * server-src/taper-source.c (default_taper_source_seek_to_part_start): + returns FALSE on not splitted dump. + * server-src/driverio.c: info.last_level should not be set on error + if level >= info.last_level. + * server-src/driver.c: Rename update_failed_dump_to_tape to + update_failed_dump. + Call update_failed_dump on failed dump to holding disk. + * application-src/amgtar.c: Don't update statefile if the backup failed. + * client-drc/sendbackup.c: Don't update amandates if backup failed. + +2009-04-03 Dustin J. Mitchell + * perl/Amanda/Changer/compat.pm: always configure devices while + scanning + * server-src/amcheckdump.pl: configure devices returned from the + changer + +2009-04-01 Nikolas Coukouma + * device-src/s3.c: don't send empty location constraint, + allocate error messages + +2009-04-01 Dustin J. Mitchell + * device-src/s3-device.c: always send errors from setup_handle + +2009-04-01 Nikolas Coukouma + * device-src/s3-device.c: don't clobber errors from setup_handle + +2009-03-31 Jean-Louis Martineau + * server-src/amcheck.c: Set l on error path. + +2009-03-31 Jean-Louis Martineau + * perl/Amanda/Changer/compat.pm: Don't import :logging from Debug. + +2009-03-30 Jean-Louis Martineau + * packaging/deb/changelog, packaging/deb/rules, + * packaging/deb/buildpkg, packaging/rpm/buildpkg, + * packaging/rpm/amanda.spec: Change version to 2.6.1p1. + * NEWS: Add news for 2.6.1p1. + * configure.in: Change version to 2.6.1p1. + +2009-03-29 Dan Locks + * packaging/rpm/amanda.spec: change a number of %if conditionals to + macros which expand if they are defined. + +2009-03-25 Dustin J. Mitchell + * device-src/s3.c: fix segfault in s3_make_bucket with location + constraint + +2009-03-19 Dustin J. Mitchell + (thanks to Peter Kunst ) + * common-src/Makefile.am: don't include genversion.h in distribution + tarballs + +2009-03-19 Dustin J. Mitchell + * xfer-src/Makefile.am: add -release to libamxfer + +2009-03-17 Jean-Louis Martineau + * server-src/amlabel.c: give correct exit status on failure + +2009-03-13 Jean-Louis Martineau + * server-src/amstatus.pl: dump in "writing to tape" mode should also + be included in the "dumped" summary. + +2009-03-13 Jean-Louis Martineau + * server-src/find.c: Fix listing of partial dump in holding disk. + +2009-03-12 Jean-Louis Martineau + * server-src/planner.c: Log quoted qname. + +2009-03-11 Dustin J. Mitchell + * device-src/amtapetype.pl: do not produce broken 'bytes' units + * installcheck/amtapetype.pl: test changes + * man/xml-source/amanda.conf.5.xml: tapetype:length is not in bytes! + * common-src/conffile.c: fix default for tapetype:length + +2009-03-11 Dustin J. Mitchell + * common-src/amfeatures.c: improve error handling in + am_string_to_feature, return NULL on error + * amandad-src/amandad_util.c recover-src/amrecover.c + server-src/amcheck.c server-src/amindexd.c server-src/chunker.c + server-src/driver.c server-src/dumper.c server-src/planner.c: always + terminate the string passed to am_string_to_feature + +2009-03-11 Dustin J. Mitchell + * common-src/amfeatures.c: fix am_string_to_feature to fail correctly + on a bad feature string + +2009-03-10 Jean-Louis Martineau + * server-src/taper.c: return DONE if input file is partial. + +2009-03-10 Dustin J. Mitchell + * common-src/conffile.c: Set default TAPETYPE_FILEMARK to 1. + +2009-02-27 Jean-Louis Martineau + * application-src/amgtar.c: Fix parsing of EXIT-HANDLING property. + +2009-02-24 Dustin J. Mitchell + * changer-src/chg-rait.sh: get directory handling right (patch from + Jim.pennino on wiki.zmanda.com) + * changer-src/chg-glue.pl: produce a debug log, add do_clean, fix + do_eject + * perl/Amanda/Changer.pm: Add a new chg->eject method, to eject a + volume that's not currently reserved + * perl/Amanda/Changer/compat.pm: fix release(), don't load 'current' + after cleaning or ejecting + * installcheck/Amanda_Changer_compat.pl: updated tests + +2009-02-24 Jean-Louis Martineau + * amandad-src/amandad.c, application-src/amgtar.c, + changer-src/scsi-changer-driver.c, client-src/client_util.c, + common-src/conffile.c, device-src/s3-device.c, + oldrecover-src/set_commands.c, recover-src/set_commands.c, + server-src/amindexd.c, server-src/planner.c, + server-src/reporter.c: Replace all occurences of index by strchr, + Replace all occurences of rindex by strrchr. + +2009-02-24 Nikolas Coukouma + * device-src/s3.c: make s3_list_keys use its own buffer + +2009-02-24 Nikolas Coukouma + * device-src/s3.c: fix error buffer handling of overflow data + +2009-02-23 Dustin J. Mitchell + * device-src/rait-device.c: actually *report* mismatched child + labels/timestamps; correctly detect the 'first' device; and free old + device label/time + +2009-02-23 Dustin J. Mitchell + * device-src/vfs-device.c: remove bogus locking stubs that are + making syscalls like close(-1); fix error handling in read_label + if check_is_dir fails() + +2009-02-19 Dustin J. Mitchell + * perl/Amanda/Changer/compat.pm: add missing semicolon in do_release + +2009-02-18 John Hein + * common-src/dgram.c: set the send buffer size when creating a new + socket + +2009-02-17 Dustin J. Mitchell + * restore-src/amfetchdump.c: remove unintended debugging messages + +2009-02-17 Jean-Louis Martineau + * changer-src/chg-manual.sh: make messages clearer + * perl/Amanda/Changer/compat.pm: use _run_tpchanger directly from + _manual_scan + * server-src/amcheckdump.pl: handle errors better + +2009-02-09 Dustin J. Mitchell + * man/xml-source/amanda.conf.5.xml: remove TODO + +2009-02-07 Dustin J. Mitchell + * common-src/event.c: use built-in child watch source on FreeBSD + +2009-02-06 Jean-Louis Martineau + * server-src/dumper.c: options is already unquoted. + * common-src/util.c: argument should not be quoted when added to argv. + +2009-02-06 Dustin J. Mitchell + * installcheck/Amanda_Changer_compat.pl: remove debugging code + +2009-02-06 Jean-Louis Martineau + patch by Yoshihiro Ishikawa + * recover-src/extract_list.c: Handle application-api. + +2009-02-06 Dustin J. Mitchell + * installcheck/Amanda_Changer_compat.pl: support 'eject' + * perl/Amanda/Changer.pm: change release/do_relase relationship + * perl/Amanda/Changer/compat.pm: same + * perl/Amanda/Changer/disk.pm: same + * perl/Amanda/Changer/single.pm: same + +2009-01-13 Dustin J. Mitchell + * perl/Amanda/Paths.pm.in: add $localstatedir + * server-src/amserverconfig.pl: remove extraneous / + +2009-02-04 Jean-Louis Martineau + * amplot/amplot.awk: Set term to x11. + +2009-02-02 Jean-Louis Martineau + * common-src/conffile.c: Correctly copy pp_scriptlist. + +2009-02-02 Dustin J. Mitchell + * config/config.guess config/config.sub: new updates from FSF + * autogen: fix quoting error + * config/amanda/dumpers.m4: use a hostname we're more confident + doesn't exist + +2009-01-30 Jean-Louis Martineau + * server-src/amstatus.pl: Remove a bogus line. + 2009-01-22 Jean-Louis Martineau * configure.in: AM_INIT_AUTOMAKE(amanda, "2.6.1") * packaging/deb/rules, packaging/deb/buildpkg, packaging/deb/changelog, diff --git a/NEWS b/NEWS index 54cf7b5..5024223 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +Changes in release 2.6.1p1 + + * amplot: better output + * Don't include genversion.h in distribution tarballs. + * Many bugs fixed + o S3 device driver + o rait device driver + o amstatus + o configure + o application-api + o compilation on some platform + o others small bug + Changes in release 2.6.1 * Application API: Allow to easily write wrappers around any backup program, diff --git a/amandad-src/amandad.c b/amandad-src/amandad.c index cfb7a47..7591705 100644 --- a/amandad-src/amandad.c +++ b/amandad-src/amandad.c @@ -1255,7 +1255,7 @@ errfd_recv( } /* for each line terminate by '\n' */ - while (as->errbuf != NULL && (r = index(as->errbuf, '\n')) != NULL) { + while (as->errbuf != NULL && (r = strchr(as->errbuf, '\n')) != NULL) { char *s; *r = '\0'; diff --git a/amandad-src/amandad_util.c b/amandad-src/amandad_util.c index 7444c5e..1173592 100644 --- a/amandad-src/amandad_util.c +++ b/amandad-src/amandad_util.c @@ -64,18 +64,24 @@ parse_g_options( while (tok != NULL) { if(strncmp(tok,"features=", 9) == 0) { + char *t = tok+9; + char *u = strchr(t, ';'); + if (u) + *u = '\0'; if(g_options->features != NULL) { dbprintf(_("multiple features option\n")); if(verbose) { g_printf(_("ERROR [multiple features option]\n")); } } - if((g_options->features = am_string_to_feature(tok+9)) == NULL) { - dbprintf(_("bad features value \"%s\"\n"), tok+10); + if((g_options->features = am_string_to_feature(t)) == NULL) { + dbprintf(_("bad features value \"%s\"\n"), t); if(verbose) { - g_printf(_("ERROR [bad features value \"%s\"]\n"), tok+10); + g_printf(_("ERROR [bad features value \"%s\"]\n"), t); } } + if (u) + *u = ';'; } else if(strncmp(tok,"hostname=", 9) == 0) { if(g_options->hostname != NULL) { diff --git a/amplot/amplot.awk b/amplot/amplot.awk index fa34c4b..2c4a5ad 100644 --- a/amplot/amplot.awk +++ b/amplot/amplot.awk @@ -439,19 +439,19 @@ function print_t(){ # printing out the labels for the graph printf "set yrange[0:%d]\n",maxy >"title"; if( maxtime < tim && extend !=0) { printf "set xrange[0:%d]\n", tim+30 >>"title"; - second_col = tim*0.5; - key_col = tim; + second_col = tim*0.45; + key_col = tim + 10; third_col = tim +13; } else { printf "set xrange[0:%d]\n", maxtime >>"title"; - second_col = (maxtime-10) * 0.5; - key_col = (maxtime-10) ; + second_col = (maxtime-10) * 0.45; + key_col = maxtime; third_col = maxtime +3; } label_shift = (7 + int(no_disks/100)); lab = label_start = maxy+(6*label_shift) ; # showing 6 labels - printf "set key %d, %d\n", key_col, lab >>"title"; + printf "set key %d, %d\n", key_col, lab+4 >>"title"; printf "set label %d \"Amanda Dump %s\" at 10,%d\n", ++label,fil, lab >"title"; lab -= label_shift; @@ -514,6 +514,8 @@ function print_t(){ # printing out the labels for the graph if(paper==1) printf "set term postscript landscape color \"Times-Roman\" 10\n" >>"title"; else printf "set term postscript portrait color \"Times-Roman\" 10\n" >>"title"; } + } else { + printf "set term x11\n" >> "title"; } printf "set ylabel """";" >>"title"; # make sure there is no ylabel fmt= "set label %d \"%s\" at "third_col", %d\n"; diff --git a/application-src/amgtar.c b/application-src/amgtar.c index c3e5966..8bdbb05 100644 --- a/application-src/amgtar.c +++ b/application-src/amgtar.c @@ -483,7 +483,7 @@ main( if (exit_handling) { char *s = exit_handling; while (s) { - char *r = index(s, '='); + char *r = strchr(s, '='); if (r) { int j = atoi(s); if (j >= 0 && j < 256) { @@ -491,9 +491,9 @@ main( if (strncasecmp(r, "GOOD", 4) == 0) { exit_value[j] = 0; } - s = index(s, ' '); } } + s = strchr(s+1, ' '); } } @@ -909,7 +909,7 @@ amgtar_backup( g_fprintf(mesgstream, "sendbackup: error [%s]\n", errmsg); } - if (incrname && strlen(incrname) > 4) { + if (!errmsg && incrname && strlen(incrname) > 4) { char *nodotnew; nodotnew = stralloc(incrname); nodotnew[strlen(nodotnew)-4] = '\0'; diff --git a/autogen b/autogen index c1204ee..cdb2735 100755 --- a/autogen +++ b/autogen @@ -12,7 +12,7 @@ rm -rf autom4te*.cache rm -f configure die() { - echo x"${@}" | sed s/^x// + echo x"${@}" | sed 's/^x//' exit 1 } diff --git a/changer-src/chg-glue.pl b/changer-src/chg-glue.pl index fe7e6a6..62c9e98 100644 --- a/changer-src/chg-glue.pl +++ b/changer-src/chg-glue.pl @@ -40,6 +40,7 @@ use Amanda::Changer; use Amanda::MainLoop; use Amanda::Config qw( :init ); use Amanda::Util qw( :constants ); +use Amanda::Debug qw( :logging ); my $chg; my $res; @@ -145,14 +146,46 @@ sub do_reset { release_and_then([], $do_reset); } +sub do_clean { + my $do_clean = sub { + $chg->clean( + finished_cb => sub { + my ($error) = @_; + if ($error) { + print "EXITSTATUS 1\n"; + print " $error\n"; + Amanda::MainLoop::call_later(\&getcmd); + } else { + print "EXITSTATUS 0\n"; + print " cleaning operation successful\n"; + Amanda::MainLoop::call_later(\&getcmd); + } + }, + drive => '', + ); + }; + release_and_then([], $do_clean); +} + sub do_eject { - release_and_then([ eject => 1 ], - sub { - print "EXITSTATUS 0\n"; - print " OK: no volume loaded\n"; - Amanda::MainLoop::call_later(\&getcmd); - } - ); + my $do_eject = sub { + $chg->eject( + finished_cb => sub { + my ($error) = @_; + if ($error) { + print "EXITSTATUS 1\n"; + print " $error\n"; + Amanda::MainLoop::call_later(\&getcmd); + } else { + print "EXITSTATUS 0\n"; + print " volume ejected\n"; + Amanda::MainLoop::call_later(\&getcmd); + } + }, + drive => '', + ); + }; + release_and_then([], $do_eject); } sub do_search { @@ -202,17 +235,22 @@ sub do_label { sub getcmd { my ($slot, $label); my $command = ; + chomp $command; + if (!defined($command)) { finish(); return; } + debug("got command '$command'"); if (($slot) = ($command =~ /^-slot (.*)$/)) { do_slot($slot); } elsif ($command =~ /^-info$/) { do_info(); } elsif ($command =~ /^-reset$/) { do_reset(); + } elsif ($command =~ /^-clean$/) { + do_clean(); } elsif ($command =~ /^-eject$/) { do_eject(); } elsif (($label) = ($command =~ /^-search (.*)/)) { @@ -239,7 +277,7 @@ sub finish { } } -Amanda::Util::setup_application("chg-glue", "server", $CONTEXT_SCRIPTUTIL); +Amanda::Util::setup_application("chg-glue", "server", $CONTEXT_DAEMON); die("$0 is for internal use only") if (@ARGV < 1); my $config_name = $ARGV[0]; diff --git a/changer-src/chg-manual.sh b/changer-src/chg-manual.sh index 1490a4d..46bf9f7 100644 --- a/changer-src/chg-manual.sh +++ b/changer-src/chg-manual.sh @@ -90,8 +90,8 @@ request_tty() { echo `_ ' or type "NONE" to abort'` > /dev/tty read ANSWER < /dev/tty if [ X"$ANSWER" = X"NONE" ]; then - echo `_ 'Aborting request'` > /dev/tty - answer=`_ ' Aborting request'` + echo `_ 'Aborting by user request'` > /dev/tty + answer=`_ ' Aborting by user request'` echo `_ 'Exit ->'` $answer >> $logfile echo $answer exit 2 @@ -126,7 +126,7 @@ request_email() { fi if [ -f $abort_filename ]; then rm -f $abort_filename - answer=`_ ' Aborting request'` + answer=`_ ' Aborting by user request'` echo `_ 'Exit ->'` $answer >> $logfile echo $answer exit 2 diff --git a/changer-src/chg-rait.sh b/changer-src/chg-rait.sh index 757661f..a1f5a46 100644 --- a/changer-src/chg-rait.sh +++ b/changer-src/chg-rait.sh @@ -85,9 +85,10 @@ do eval tapedev=\$tapedev_$i mkdir -p $WORK/$i - cd $WORK/$i + ( + cd $WORK/$i - cat >> amanda.conf <> amanda.conf < exitcode - ) > stdout 2>stderr & + ( + $tpchanger "$@" + echo "$?"> exitcode + ) > stdout 2>stderr & + ) - i=`expr $i + 1` + i=`expr $i + 1` done - wait # diff --git a/changer-src/scsi-changer-driver.c b/changer-src/scsi-changer-driver.c index d53c804..8693bf3 100644 --- a/changer-src/scsi-changer-driver.c +++ b/changer-src/scsi-changer-driver.c @@ -6621,7 +6621,7 @@ printf_arglist_function2(void DebugPrint, int, level, int, section, char *, fmt) { if (section == dsection || dsection == 0) { - if (index(buf, '\n') != NULL && strlen(buf) > 1) + if (strchr(buf, '\n') != NULL && strlen(buf) > 1) { dbprintf(_("%ld:%s"), (long)ti, buf); } else { diff --git a/client-src/client_util.c b/client-src/client_util.c index ef28c1a..d427400 100644 --- a/client-src/client_util.c +++ b/client-src/client_util.c @@ -1006,7 +1006,7 @@ run_client_script( if (BSTRNCMP(line, "PROPERTY ") == 0) { char *property_name, *property_value; property_name = line + 9; - property_value = index(property_name,' '); + property_value = strchr(property_name,' '); if (property_value == NULL) { char *msg = g_strdup_printf( "ERROR %s: Bad output property: %s", diff --git a/client-src/sendbackup.c b/client-src/sendbackup.c index 6da1326..6ca2787 100644 --- a/client-src/sendbackup.c +++ b/client-src/sendbackup.c @@ -667,15 +667,17 @@ main( /*NOTREACHED*/ } + result = 0; while ((line = agets(dumperr)) != NULL) { if (strlen(line) > 0) { fdprintf(mesgfd, "sendbackup: error [%s]\n", line); dbprintf("error: %s\n", line); + result = 1; } amfree(line); } - result = check_result(mesgfd); + result |= check_result(mesgfd); if (result == 0) { char *amandates_file; diff --git a/common-src/Makefile.am b/common-src/Makefile.am index daaf7b4..e51fde5 100644 --- a/common-src/Makefile.am +++ b/common-src/Makefile.am @@ -137,7 +137,7 @@ EXTRA_PROGRAMS = genversion $(TEST_PROGS) # 4. Makefile runs genversion to create version.c # 5. version.c is compiled into libamanda normally -genversion_SOURCES = genversion.c genversion.h svn-info.h +genversion_SOURCES = genversion.c svn-info.h genversion_LDADD = $(libamanda_la_LIBADD) \ versuff.lo \ ../gnulib/libgnu.la diff --git a/common-src/Makefile.in b/common-src/Makefile.in index b645793..c5dda60 100644 --- a/common-src/Makefile.in +++ b/common-src/Makefile.in @@ -1003,7 +1003,7 @@ noinst_HEADERS = \ # 3. Makefile builds genversion # 4. Makefile runs genversion to create version.c # 5. version.c is compiled into libamanda normally -genversion_SOURCES = genversion.c genversion.h svn-info.h +genversion_SOURCES = genversion.c svn-info.h genversion_LDADD = $(libamanda_la_LIBADD) \ versuff.lo \ ../gnulib/libgnu.la diff --git a/common-src/amfeatures.c b/common-src/amfeatures.c index 5d03ed5..5364ae4 100644 --- a/common-src/amfeatures.c +++ b/common-src/amfeatures.c @@ -408,6 +408,7 @@ am_string_to_feature( am_feature_t *f = NULL; size_t i; int ch1, ch2; + char * orig = s; if (s != NULL && strcmp(s,"UNKNOWNFEATURE") != 0) { f = am_allocate_feature_set(); @@ -418,10 +419,10 @@ am_string_to_feature( ch1 -= 'a'; ch1 += 10; } else if (ch1 >= 'A' && ch1 <= 'F') { - ch1 -= 'a'; + ch1 -= 'A'; ch1 += 10; } else { - break; + goto bad; } ch2 = *s++; if (isdigit(ch2)) { @@ -430,16 +431,23 @@ am_string_to_feature( ch2 -= 'a'; ch2 += 10; } else if (ch2 >= 'A' && ch2 <= 'F') { - ch2 -= 'a'; + ch2 -= 'A'; ch2 += 10; - } else { - am_release_feature_set(f); /* bad conversion */ + } else if (ch2 == '\0') { + g_warning("odd number of digits in amfeature string; truncating"); break; + } else { + goto bad; } f->bytes[i] = (unsigned char)((ch1 << 4) | ch2); } } return f; + +bad: + g_warning("Bad feature string '%s'", orig); + am_release_feature_set(f); + return NULL; } #if defined(TEST) diff --git a/common-src/conffile.c b/common-src/conffile.c index cf88dd8..718d2a0 100644 --- a/common-src/conffile.c +++ b/common-src/conffile.c @@ -1424,7 +1424,7 @@ negative_number: /* look for goto negative_number below sign is set there */ break; escape = 0; buf--; /* Consume escape in buffer */ - } else if (ch == '\\') { + } else if (ch == '\\' && !escape) { escape = 1; } else { if (ch == '"') { @@ -2117,8 +2117,8 @@ init_tapetype_defaults(void) conf_init_str(&tpcur.value[TAPETYPE_LBL_TEMPL] , ""); conf_init_size (&tpcur.value[TAPETYPE_BLOCKSIZE] , DISK_BLOCK_KB); conf_init_size (&tpcur.value[TAPETYPE_READBLOCKSIZE], DISK_BLOCK_KB); - conf_init_int64 (&tpcur.value[TAPETYPE_LENGTH] , ((gint64)2000 * 1024)); - conf_init_int64 (&tpcur.value[TAPETYPE_FILEMARK] , (gint64)1000); + conf_init_int64 (&tpcur.value[TAPETYPE_LENGTH] , ((gint64)2000)); + conf_init_int64 (&tpcur.value[TAPETYPE_FILEMARK] , (gint64)1); conf_init_int (&tpcur.value[TAPETYPE_SPEED] , 200); conf_init_bool (&tpcur.value[TAPETYPE_FILE_PAD] , 1); } @@ -5158,7 +5158,7 @@ add_config_overwrite_opt( char *value; assert(optarg != NULL); - value = index(optarg, '='); + value = strchr(optarg, '='); if (value == NULL) { error(_("Must specify a value for %s."), optarg); /* NOTREACHED */ @@ -5569,7 +5569,7 @@ copy_val_t( valdst->v.pp_scriptlist = NULL; if (valsrc->v.pp_scriptlist) { g_slist_foreach(valsrc->v.pp_scriptlist, ©_pp_scriptlist, - valdst->v.pp_scriptlist); + &valdst->v.pp_scriptlist); } break; @@ -5608,9 +5608,9 @@ copy_pp_scriptlist( gpointer user_data_p) { pp_script_t *pp_script = data_p; - pp_scriptlist_t pp_scriptlist = user_data_p; + pp_scriptlist_t *pp_scriptlist = user_data_p; - pp_scriptlist = g_slist_append(pp_scriptlist, pp_script); + *pp_scriptlist = g_slist_append(*pp_scriptlist, pp_script); } static void diff --git a/common-src/dgram.c b/common-src/dgram.c index f0e80ec..99ccdc5 100644 --- a/common-src/dgram.c +++ b/common-src/dgram.c @@ -61,6 +61,7 @@ dgram_bind( sockaddr_union name; int save_errno; int *portrange; + int sndbufsize = MAX_DGRAM; portrange = getconf_intrange(CNF_RESERVED_UDP_PORT); *portp = (in_port_t)0; @@ -80,6 +81,13 @@ dgram_bind( return -1; } + /* try setting the buffer size (= maximum allowable UDP packet size) */ + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, + (void *) &sndbufsize, sizeof(sndbufsize)) < 0) { + dbprintf("dgram_bind: could not set udp send buffer to %d: %s (ignored)\n", + sndbufsize, strerror(errno)); + } + SU_INIT(&name, family); SU_SET_INADDR_ANY(&name); @@ -159,6 +167,8 @@ dgram_send_addr( s = dgram->socket; socket_opened = 0; } else { + int sndbufsize = MAX_DGRAM; + g_debug("dgram_send_addr: setting up a socket with family %d", SU_GET_FAMILY(addr)); if((s = socket(SU_GET_FAMILY(addr), SOCK_DGRAM, 0)) == -1) { save_errno = errno; @@ -176,6 +186,13 @@ dgram_send_addr( strerror(errno)); } #endif + + /* try setting the buffer size (= maximum allowable UDP packet size) */ + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, + (void *) &sndbufsize, sizeof(sndbufsize)) < 0) { + dbprintf("dgram_send_addr: could not set udp send buffer to %d: %s (ignored)\n", + sndbufsize, strerror(errno)); + } } if(s < 0 || s >= (int)FD_SETSIZE) { diff --git a/common-src/event.c b/common-src/event.c index 474e871..775d97d 100644 --- a/common-src/event.c +++ b/common-src/event.c @@ -479,8 +479,12 @@ new_fdsource(gint fd, GIOCondition events) * exponentially increasing interals. Writing a smarter implementation runs into * some tricky race conditions and extra machinery. Since there are few, if any, * users of a glib version this old, such machinery wouldn't get much testing. + * + * FreeBSD users have also reported problems with the glib child watch source, + * so we use the dumb version on FreeBSD, too. */ -#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6)) + +#if (defined(__FreeBSD__) || GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 6)) typedef struct ChildWatchSource { GSource source; /* must be the first element in the struct */ diff --git a/common-src/genversion.h b/common-src/genversion.h deleted file mode 100644 index c140539..0000000 --- a/common-src/genversion.h +++ /dev/null @@ -1,3 +0,0 @@ -#define CC "gcc" -#define BUILT_DATE "Thu Jan 22 08:52:28 EST 2009" -#define BUILT_MACH "x86_64-unknown-linux-gnu" diff --git a/common-src/svn-info.h b/common-src/svn-info.h index 3e2b034..8313fa4 100644 --- a/common-src/svn-info.h +++ b/common-src/svn-info.h @@ -1,2 +1,2 @@ -#define BUILT_REV "1609" +#define BUILT_REV "1857" #define BUILT_BRANCH "amanda-261" diff --git a/common-src/util.c b/common-src/util.c index 24398f5..1c1856a 100644 --- a/common-src/util.c +++ b/common-src/util.c @@ -1044,9 +1044,9 @@ void proplist_add_to_argv( property_t *value_s = value_p; char ***argv = user_data_p; GSList *value; - char *q, *w, *qprop, *qvalue; + char *q, *w, *qprop; - q = quote_string(property_s); + q = stralloc(property_s); /* convert to lower case */ for (w=q; *w != '\0'; w++) { *w = tolower(*w); @@ -1056,10 +1056,9 @@ void proplist_add_to_argv( qprop = stralloc2("--", q); amfree(q); for(value=value_s->values; value != NULL; value = value->next) { - qvalue = quote_string((char *)value->data); **argv = stralloc(qprop); (*argv)++; - **argv = qvalue; + **argv = stralloc((char *)value->data); (*argv)++; } amfree(qprop); diff --git a/common-src/versuff.c b/common-src/versuff.c index 03e6183..367d125 100644 --- a/common-src/versuff.c +++ b/common-src/versuff.c @@ -34,13 +34,13 @@ const int VERSION_MAJOR = 2; const int VERSION_MINOR = 6; const int VERSION_PATCH = 1; -const char *const VERSION_COMMENT = ""; +const char *const VERSION_COMMENT = "p1"; const char * versionsuffix(void) { #ifdef USE_VERSION_SUFFIXES - return "-2.6.1"; + return "-2.6.1p1"; #else return ""; #endif @@ -49,5 +49,5 @@ versionsuffix(void) const char * version(void) { - return "2.6.1"; + return "2.6.1p1"; } diff --git a/config/amanda/dumpers.m4 b/config/amanda/dumpers.m4 index 76b20d9..3763d4e 100644 --- a/config/amanda/dumpers.m4 +++ b/config/amanda/dumpers.m4 @@ -107,11 +107,11 @@ AC_DEFUN([AMANDA_PROG_SAMBA_CLIENT], AC_PATH_PROG(SAMBA_CLIENT,smbclient,,$LOCSYSPATH) smbversion=0 if test ! -z "$SAMBA_CLIENT"; then - case "`\"$SAMBA_CLIENT\" '\\\\not.a.host.name\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in + case "`\"$SAMBA_CLIENT\" '\\\\nosuchhost.amanda.org\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in *"Unknown host"*) smbversion=1 ;; - *"Connection to not.a.host.name failed"*) + *"Connection to nosuchhost.amanda.org failed"*) smbversion=2 ;; *) diff --git a/config/config.guess b/config/config.guess index 6960a39..1b0bc14 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-01-15' +timestamp='2008-12-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -if [ "${UNAME_SYSTEM}" = "Linux" ] ; then - eval $set_cc_for_build - cat << EOF > $dummy.c - #include - #ifdef __UCLIBC__ - # ifdef __UCLIBC_CONFIG_VERSION__ - LIBC=uclibc __UCLIBC_CONFIG_VERSION__ - # else - LIBC=uclibc - # endif - #else - LIBC=gnu - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` -fi - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -347,8 +330,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -549,7 +545,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -808,12 +804,18 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -847,28 +849,35 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-${LIBC} + echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-${LIBC} + echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-${LIBC} + echo frv-unknown-linux-gnu exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:*) eval $set_cc_for_build @@ -891,7 +900,7 @@ EOF s: ::g p }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -914,16 +923,16 @@ EOF s: ::g p }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-${LIBC} + echo or32-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -936,40 +945,43 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-${LIBC} + echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-${LIBC} + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -984,22 +996,17 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" + echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" exit ;; esac - # This should get integrated into the C code below, but now we hack - if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi # Determine whether the default compiler is a.out or elf eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -1147,6 +1154,16 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1222,6 +1239,9 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1490,9 +1510,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/config/config.sub b/config/config.sub index 2a4932e..d8573e8 100755 --- a/config/config.sub +++ b/config/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-01-18' +timestamp='2009-01-19' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -244,18 +245,21 @@ case $basic_machine in | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx | dvp \ + | d10v | d30v | dlx | dsp16xx \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -277,7 +281,7 @@ case $basic_machine in | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +290,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +333,17 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +365,24 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -443,10 +454,22 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -475,8 +498,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -514,6 +537,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -668,6 +695,14 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +718,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -690,24 +729,6 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -827,6 +848,14 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1035,6 +1064,10 @@ case $basic_machine in basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1110,6 +1143,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1148,7 +1185,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1220,6 +1257,7 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1230,7 +1268,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1240,7 +1278,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1370,6 +1408,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff --git a/configure b/configure index 4194c65..6f2a68f 100755 --- a/configure +++ b/configure @@ -3210,7 +3210,7 @@ fi # Define the identity of the package. PACKAGE=amanda - VERSION="2.6.1" + VERSION="2.6.1p1" cat >>confdefs.h <<_ACEOF @@ -32069,11 +32069,11 @@ fi smbversion=0 if test ! -z "$SAMBA_CLIENT"; then - case "`\"$SAMBA_CLIENT\" '\\\\not.a.host.name\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in + case "`\"$SAMBA_CLIENT\" '\\\\nosuchhost.amanda.org\\notashare' -U nosuchuser -N -Tx /dev/null 2>&1`" in *"Unknown host"*) smbversion=1 ;; - *"Connection to not.a.host.name failed"*) + *"Connection to nosuchhost.amanda.org failed"*) smbversion=2 ;; *) diff --git a/configure.in b/configure.in index 338abfe..14a3ab9 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_TARGET([]) PACKAGE=amanda AC_SUBST(PACKAGE) -AM_INIT_AUTOMAKE(amanda, "2.6.1") +AM_INIT_AUTOMAKE(amanda, "2.6.1p1") AC_CONFIG_HEADERS([config/config.h]) dnl Minimum Autoconf version required. diff --git a/device-src/amtapetype.pl b/device-src/amtapetype.pl index 299bd77..ea1c97c 100644 --- a/device-src/amtapetype.pl +++ b/device-src/amtapetype.pl @@ -315,14 +315,28 @@ sub make_tapetype { my $comment = "Created by amtapetype; compression " . ($compression_enabled? "enabled" : "disabled"); - print <access_mode = mode; dself->in_file = FALSE; + amfree(dself->volume_label); + amfree(dself->volume_time); ops = g_ptr_array_sized_new(self->private->children->len); for (i = 0; i < self->private->children->len; i ++) { @@ -1297,7 +1299,7 @@ rait_device_start (Device * dself, DeviceAccessMode mode, char * label, device_error_or_status(child))); } else { if (child->volume_label != NULL && child->volume_time != NULL) { - if (dself->volume_label != NULL && dself->volume_time != NULL) { + if (label_from_device) { if (strcmp(child->volume_label, dself->volume_label) != 0 || strcmp(child->volume_time, dself->volume_time) != 0) { /* Mismatch! (Two devices provided different labels) */ @@ -1313,6 +1315,7 @@ rait_device_start (Device * dself, DeviceAccessMode mode, char * label, label_from_device); append_message(&failure_errmsgs, this_message); total_status |= DEVICE_STATUS_DEVICE_ERROR; + g_warning("RAIT device children have different labels or timestamps"); } } else { /* First device with a volume. */ @@ -1325,6 +1328,7 @@ rait_device_start (Device * dself, DeviceAccessMode mode, char * label, char * this_message = g_strdup_printf("%s: Says label read, but no volume " "label found.", child->device_name); + g_warning("RAIT device child has NULL volume or label"); append_message(&failure_errmsgs, this_message); total_status |= DEVICE_STATUS_DEVICE_ERROR; } @@ -1336,7 +1340,7 @@ rait_device_start (Device * dself, DeviceAccessMode mode, char * label, dself->status = total_status; - if (!success) { + if (total_status != DEVICE_STATUS_SUCCESS || !success) { device_set_error(dself, failure_errmsgs, total_status); return FALSE; } diff --git a/device-src/s3-device.c b/device-src/s3-device.c index 0fe3bb0..325d893 100644 --- a/device-src/s3-device.c +++ b/device-src/s3-device.c @@ -860,7 +860,7 @@ s3_device_open_device(Device *pself, char *device_name, /* Device name may be bucket/prefix, to support multiple volumes in a * single bucket. */ - name_colon = index(device_node, '/'); + name_colon = strchr(device_node, '/'); if (name_colon == NULL) { self->bucket = g_strdup(device_node); self->prefix = g_strdup(""); @@ -916,12 +916,27 @@ static void s3_device_finalize(GObject * obj_self) { static gboolean setup_handle(S3Device * self) { Device *d_self = DEVICE(self); if (self->s3 == NULL) { - if (self->access_key == NULL) + + if (self->access_key == NULL || self->access_key[0] == '\0') { + device_set_error(d_self, + stralloc(_("No Amazon access key specified")), + DEVICE_STATUS_DEVICE_ERROR); return FALSE; - if (self->secret_key == NULL) + } + + if (self->secret_key == NULL || self->secret_key[0] == '\0') { + device_set_error(d_self, + stralloc(_("No Amazon secret key specified")), + DEVICE_STATUS_DEVICE_ERROR); return FALSE; - if (self->is_devpay && self->user_token == NULL) + } + + if (self->is_devpay && self->user_token == NULL) { + device_set_error(d_self, + stralloc(_("No Amazon user token specified")), + DEVICE_STATUS_DEVICE_ERROR); return FALSE; + } self->s3 = s3_open(self->access_key, self->secret_key, self->user_token, self->bucket_location); @@ -963,7 +978,7 @@ s3_device_read_label(Device *pself) { if (device_in_error(self)) return pself->status; if (!setup_handle(self)) { - device_set_error(pself, stralloc(_("Error setting up S3 interface")), DEVICE_STATUS_DEVICE_ERROR); + /* setup_handle already set our error message */ return pself->status; } @@ -1024,9 +1039,7 @@ s3_device_start (Device * pself, DeviceAccessMode mode, if (device_in_error(self)) return FALSE; if (!setup_handle(self)) { - device_set_error(pself, - stralloc(_("Error setting up S3 interface")), - DEVICE_STATUS_DEVICE_ERROR); + /* setup_handle already set our error message */ return FALSE; } diff --git a/device-src/s3.c b/device-src/s3.c index a9dbd67..3fbb3b4 100644 --- a/device-src/s3.c +++ b/device-src/s3.c @@ -154,6 +154,7 @@ typedef struct { gpointer write_data; gboolean headers_done; + gboolean int_write_done; char *etag; } S3InternalData; @@ -991,7 +992,7 @@ perform_request(S3Handle *hdl, CURLcode curl_code = CURLE_OK; char curl_error_buffer[CURL_ERROR_SIZE] = ""; struct curl_slist *headers = NULL; - S3InternalData int_writedata = {{NULL, 0, 0, MAX_ERROR_RESPONSE_LEN}, NULL, NULL, NULL, FALSE, NULL}; + S3InternalData int_writedata = {{NULL, 0, 0, MAX_ERROR_RESPONSE_LEN}, NULL, NULL, NULL, FALSE, FALSE, NULL}; gboolean should_retry; guint retries = 0; gulong backoff = EXPONENTIAL_BACKOFF_START_USEC; @@ -1203,7 +1204,16 @@ s3_internal_write_func(void *ptr, size_t size, size_t nmemb, void * stream) if (!data->headers_done) return size*nmemb; - bytes_saved = s3_buffer_write_func(ptr, size, nmemb, &data->resp_buf); + /* call write on internal buffer (if not full) */ + if (data->int_write_done) { + bytes_saved = 0; + } else { + bytes_saved = s3_buffer_write_func(ptr, size, nmemb, &data->resp_buf); + if (!bytes_saved) { + data->int_write_done = TRUE; + } + } + /* call write on user buffer */ if (data->write_func) { return data->write_func(ptr, size, nmemb, data->write_data); } else { @@ -1218,6 +1228,7 @@ s3_internal_reset_func(void * stream) s3_buffer_reset_func(&data->resp_buf); data->headers_done = FALSE; + data->int_write_done = FALSE; data->etag = NULL; if (data->reset_func) { data->reset_func(data->write_data); @@ -1475,7 +1486,7 @@ s3_strerror(S3Handle *hdl) s3_error(hdl, &message, &response_code, NULL, &s3_error_name, &curl_code, &num_retries); if (!message) - message = "Unkonwn S3 error"; + message = "Unknown S3 error"; if (s3_error_name) g_snprintf(s3_info, sizeof(s3_info), " (%s)", s3_error_name); if (response_code) @@ -1624,7 +1635,8 @@ list_fetch(S3Handle *hdl, const char *prefix, const char *delimiter, const char *marker, - const char *max_keys) + const char *max_keys, + CurlBuffer *buf) { s3_result_t result = S3_RESULT_FAIL; static result_handling_t result_handling[] = { @@ -1636,7 +1648,7 @@ list_fetch(S3Handle *hdl, {"prefix", prefix}, {"delimiter", delimiter}, {"marker", marker}, - {"make-keys", max_keys}, + {"max-keys", max_keys}, {NULL, NULL} }; char *esc_value; @@ -1660,7 +1672,8 @@ list_fetch(S3Handle *hdl, /* and perform the request on that URI */ result = perform_request(hdl, "GET", bucket, NULL, NULL, query->str, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, + S3_BUFFER_WRITE_FUNCS, buf, NULL, NULL, result_handling); if (query) g_string_free(query, TRUE); @@ -1675,11 +1688,25 @@ s3_list_keys(S3Handle *hdl, const char *delimiter, GSList **list) { + /* + * max len of XML variables: + * bucket: 255 bytes (p12 API Version 2006-03-01) + * key: 1024 bytes (p15 API Version 2006-03-01) + * size per key: 5GB bytes (p6 API Version 2006-03-01) + * size of size 10 bytes (i.e. 10 decimal digits) + * etag: 44 (observed+assumed) + * owner ID: 64 (observed+assumed) + * owner DisplayName: 255 (assumed) + * StorageClass: const (p18 API Version 2006-03-01) + */ + static const guint MAX_RESPONSE_LEN = 1000*2000; + static const char *MAX_KEYS = "1000"; struct list_keys_thunk thunk; GMarkupParseContext *ctxt = NULL; static GMarkupParser parser = { list_start_element, list_end_element, list_text, NULL, NULL }; GError *err = NULL; s3_result_t result = S3_RESULT_FAIL; + CurlBuffer buf = {NULL, 0, 0, MAX_RESPONSE_LEN}; g_assert(list); *list = NULL; @@ -1689,8 +1716,9 @@ s3_list_keys(S3Handle *hdl, /* Loop until S3 has given us the entire picture */ do { + s3_buffer_reset_func(&buf); /* get some data from S3 */ - result = list_fetch(hdl, bucket, prefix, delimiter, thunk.next_marker, NULL); + result = list_fetch(hdl, bucket, prefix, delimiter, thunk.next_marker, MAX_KEYS, &buf); if (result != S3_RESULT_OK) goto cleanup; /* run the parser over it */ @@ -1701,8 +1729,7 @@ s3_list_keys(S3Handle *hdl, ctxt = g_markup_parse_context_new(&parser, 0, (gpointer)&thunk, NULL); - if (!g_markup_parse_context_parse(ctxt, hdl->last_response_body, - hdl->last_response_body_size, &err)) { + if (!g_markup_parse_context_parse(ctxt, buf.buffer, buf.buffer_pos, &err)) { if (hdl->last_message) g_free(hdl->last_message); hdl->last_message = g_strdup(err->message); result = S3_RESULT_FAIL; @@ -1725,6 +1752,7 @@ cleanup: if (thunk.text) g_free(thunk.text); if (thunk.next_marker) g_free(thunk.next_marker); if (ctxt) g_markup_parse_context_free(ctxt); + if (buf.buffer) g_free(buf.buffer); if (result != S3_RESULT_OK) { g_slist_free(thunk.filename_list); @@ -1804,11 +1832,11 @@ s3_make_bucket(S3Handle *hdl, g_assert(hdl != NULL); - if (hdl->bucket_location) { + if (hdl->bucket_location && hdl->bucket_location[0]) { if (s3_bucket_location_compat(bucket)) { ptr = &buf; buf.buffer = g_strdup_printf(AMAZON_BUCKET_CONF_TEMPLATE, hdl->bucket_location); - buf.buffer_len = (guint) strlen(body); + buf.buffer_len = (guint) strlen(buf.buffer); buf.buffer_pos = 0; buf.max_buffer_size = buf.buffer_len; read_func = s3_buffer_read_func; @@ -1847,7 +1875,10 @@ s3_make_bucket(S3Handle *hdl, if (body) g_free(body); /* use strndup to get a null-terminated string */ body = g_strndup(hdl->last_response_body, hdl->last_response_body_size); - if (!body) goto cleanup; + if (!body) { + hdl->last_message = g_strdup(_("No body received for location request")); + goto cleanup; + } if (!s3_regexec_wrap(&location_con_regex, body, 4, pmatch, 0)) { loc_end_open = find_regex_substring(body, pmatch[1]); @@ -1858,18 +1889,18 @@ s3_make_bucket(S3Handle *hdl, */ if ('\0' == hdl->bucket_location[0] && '/' != loc_end_open[0] && '\0' != hdl->bucket_location[0]) - hdl->last_message = _("An empty location constraint is " - "configured, but the bucket has a non-empty location constraint"); + hdl->last_message = g_strdup(_("An empty location constraint is " + "configured, but the bucket has a non-empty location constraint")); else if (strncmp(loc_content, hdl->bucket_location, strlen(hdl->bucket_location))) - hdl->last_message = _("The location constraint configured " - "does not match the constraint currently on the bucket"); + hdl->last_message = g_strdup(_("The location constraint configured " + "does not match the constraint currently on the bucket")); else result = S3_RESULT_OK; - } else { - hdl->last_message = _("Unexpected location response from Amazon S3"); - } - } - } + } else { + hdl->last_message = g_strdup(_("Unexpected location response from Amazon S3")); + } + } + } cleanup: if (body) g_free(body); diff --git a/device-src/vfs-device.c b/device-src/vfs-device.c index 667c548..ce536b8 100644 --- a/device-src/vfs-device.c +++ b/device-src/vfs-device.c @@ -46,10 +46,6 @@ typedef struct { /*< private >*/ char * dir_name; char * file_name; - int file_lock_fd; - char * file_lock_name; - int volume_lock_fd; - char * volume_lock_name; int open_file_fd; /* Properties */ @@ -191,9 +187,8 @@ vfs_device_init (VfsDevice * self) { GValue response; self->dir_name = self->file_name = NULL; - self->file_lock_name = self->volume_lock_name = NULL; - self->file_lock_fd = self->volume_lock_fd = self->open_file_fd = -1; - self->volume_bytes = 0; + self->open_file_fd = -1; + self->volume_bytes = 0; self->volume_limit = 0; /* Register Properties */ @@ -331,19 +326,14 @@ vfs_device_get_free_space_fn(struct Device *p_self, return TRUE; } -/* Drops everything associated with the volume file: Its name and fd, - its lock, and its lock's name and fd. */ +/* Drops everything associated with the volume file: Its name and fd. */ static void release_file(VfsDevice * self) { /* Doesn't hurt. */ - robust_close(self->open_file_fd); + if (self->open_file_fd != -1) + robust_close(self->open_file_fd); amfree(self->file_name); - if (self->file_lock_fd > 0) { - amfunlock(self->file_lock_fd, self->file_lock_name); - close(self->file_lock_fd); - amfree(self->file_lock_name); - } - self->file_lock_fd = self->open_file_fd = -1; + self->open_file_fd = -1; } static void vfs_device_finalize(GObject * obj_self) { @@ -360,13 +350,6 @@ static void vfs_device_finalize(GObject * obj_self) { amfree(self->dir_name); release_file(self); - - if (self->volume_lock_fd >= 0) { - amfunlock(self->volume_lock_fd, self->volume_lock_name); - close(self->volume_lock_fd); - } - - amfree(self->volume_lock_name); } static Device * vfs_device_factory(char * device_name, char * device_type, char * device_node) { @@ -486,62 +469,13 @@ static gboolean open_lock(G_GNUC_UNUSED VfsDevice * self, /* At the moment, file locking is horribly broken. */ return TRUE; - -/* - int fd; - char * name; - Device *d_self = DEVICE(self); - if (file < 0) { - if (self->volume_lock_name == NULL) { - self->volume_lock_name = lockfile_name(self, 0); - } else if (self->volume_lock_fd >= 0) { - amfunlock(self->volume_lock_fd, self->volume_lock_name); - close(self->volume_lock_fd); - } - name = self->volume_lock_name; - } else { - if (self->file_lock_fd >= 0 && self->file_lock_name != NULL) { - amfunlock(self->file_lock_fd, self->file_lock_name); - } - amfree(self->file_lock_name); - close(self->file_lock_fd); - name = self->file_lock_name = lockfile_name(self, file); - } - - - fd = robust_open(name, O_CREAT | O_WRONLY, VFS_DEVICE_CREAT_MODE); - - if (fd < 0) { - device_set_error(d_self, - vstrallocf(_("Can't open lock file %s: %s"), name, strerror(errno)), - DEVICE_STATUS_DEVICE_ERROR); - return FALSE; - } - - if (exclusive) { - amflock(fd, name); - } else { - amroflock(fd, name); - } - - if (file < 0) { - self->volume_lock_fd = fd; - } else { - self->file_lock_fd = fd; - } - return TRUE; -*/ } /* For now, does it the bad way. */ -static void promote_volume_lock(VfsDevice * self) { - amfunlock(self->volume_lock_fd, self->volume_lock_name); - amflock(self->volume_lock_fd, self->volume_lock_name); +static void promote_volume_lock(VfsDevice * self G_GNUC_UNUSED) { } -static void demote_volume_lock(VfsDevice * self) { - amfunlock(self->volume_lock_fd, self->volume_lock_name); - amroflock(self->volume_lock_fd, self->volume_lock_name); +static void demote_volume_lock(VfsDevice * self G_GNUC_UNUSED) { } /* A SearchDirectoryFunctor */ @@ -749,7 +683,7 @@ static DeviceStatusFlags vfs_device_read_label(Device * dself) { if (!check_is_dir(dself, self->dir_name)) { /* error message set by check_is_dir */ - return FALSE; + return dself->status; } amfree(dself->volume_label); @@ -1314,14 +1248,6 @@ vfs_device_recycle_file (Device * pself, guint filenum) { return FALSE; } - if (!try_unlink(self->file_lock_name)) { - device_set_error(pself, - vstrallocf(_("Unlink of %s failed: %s"), self->file_lock_name, strerror(errno)), - DEVICE_STATUS_VOLUME_ERROR); - release_file(self); - return FALSE; - } - self->volume_bytes -= file_size; release_file(self); return TRUE; diff --git a/installcheck/Amanda_Changer_compat.pl b/installcheck/Amanda_Changer_compat.pl index 2480204..6e75f7c 100644 --- a/installcheck/Amanda_Changer_compat.pl +++ b/installcheck/Amanda_Changer_compat.pl @@ -16,7 +16,7 @@ # Contact information: Zmanda Inc, 465 S Mathlida Ave, Suite 300 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com -use Test::More tests => 17; +use Test::More tests => 22; use File::Path; use strict; use warnings; @@ -38,6 +38,7 @@ Amanda::Debug::dbopen("installcheck"); Amanda::Debug::disable_die_override(); my $changer_filename = "$AMANDA_TMPDIR/chg-test"; +my $result_file = "$AMANDA_TMPDIR/chg-test.result"; # Set up a 'test' changer; several of these are defined below. sub setup_changer { @@ -54,6 +55,17 @@ sub setup_changer { chmod 0755, $changer_filename; } +# slurp the $result_file +sub slurp_result { + return '' unless (-r $result_file); + + open(my $fh, "<", $result_file) or die("open $result_file: $!"); + my $result = do { local $/; <$fh> }; + close($fh); + + return $result; +} + # Functions to invoke the changer and later verify the result { my $expected_err_re; @@ -120,9 +132,15 @@ case "${1}" in 2) echo " slot 2 is empty"; exit 1;; 3) echo "1"; exit 0;; # test missing 'device' portion esac;; - -reset) echo "reset ignored";; - -eject) echo "eject ignored";; - -clean) echo "clean ignored";; + -reset) + echo "reset" > @AMANDA_TMPDIR@/chg-test.result + echo "reset ignored";; + -eject) + echo "eject" > @AMANDA_TMPDIR@/chg-test.result + echo "eject ignored";; + -clean) + echo "clean" > @AMANDA_TMPDIR@/chg-test.result + echo "clean ignored";; -label) case "${2}" in foo?bar) echo "1 ok"; exit 0;; @@ -171,13 +189,20 @@ try_run_changer( # sub { $chg->load(slot => '3', res_cb => \&check_res_cb); }, # undef, undef, "search by slot; invalid response"); +try_run_changer( + sub { $chg->eject(finished_cb => \&check_finished_cb); }, + undef, undef, "chg->eject doesn't fail"); +like(slurp_result(), qr/eject/, ".. and calls chg-test -eject"); + try_run_changer( sub { $chg->reset(finished_cb => \&check_finished_cb); }, - undef, undef, "reset doesn't fail"); + undef, undef, "chg->reset doesn't fail"); +like(slurp_result(), qr/reset/, ".. and calls chg-test -reset"); try_run_changer( sub { $chg->clean(finished_cb => \&check_finished_cb); }, - undef, undef, "clean doesn't fail"); + undef, undef, "chg->clean doesn't fail"); +like(slurp_result(), qr/clean/, ".. and calls chg-test -clean"); # TODO test update() @@ -215,6 +240,8 @@ try_run_changer( ok(!defined $err, "release with eject succeeds"); + like(slurp_result(), qr/eject/, "..and calls chg-test -eject"); + Amanda::MainLoop::quit(); }; diff --git a/man/amaddclient.8 b/man/amaddclient.8 index 35d1cf7..b551670 100644 --- a/man/amaddclient.8 +++ b/man/amaddclient.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amaddclient .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMADDCLIENT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMADDCLIENT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,15 +18,13 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amaddclient \- program to add client to an existing \fIAmanda\fR configuration -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamaddclient\fR\ 'u \fBamaddclient\fR \-\-config \fIconfig\fR || \-\-client \fIclient\ name\fR || \-\-diskdev \fIdirectory\ to\ backup\fR [\-\-m] [\-\-dumptype\ \fIstring\fR] [\-\-includefile\ \fIstring\fR] [\-\-includelist\ \fIstring\fR] [\-\-excludefile\ \fIstring\fR] [\-\-excludelist\ \fIstring\fR] [\-\-user\ \fIstring\fR] [\-\-auth\ \fIstring\fR] [\-\-gnutar_list_dir\ \fIstring\fR] [\-\-amandates\ \fIstring\fR] [\-\-no\-client\-update] [\-\-batch] [\-\-help] -.fam .SH "DESCRIPTION" .PP After Amanda rpms are successfully installed and @@ -203,7 +53,7 @@ for detail\&.) must be run by user amandabackup\&. .PP \-\-config, \-\-client and \-\-diskdev must be specified\&. -.SH "Options" +.SH "OPTIONS" .PP .RS 4 @@ -310,7 +160,7 @@ string is a glob expression .RS 4 string is a file name on the client containing glob expressions\&. Specify either \-\-excludefile or \-\-excludelist\&. .RE -.SH "Files" +.SH "FILES" .PP \fB/var/lib/amanda/template\&.d\fR .RS 4 @@ -370,9 +220,9 @@ On success, zero is returned\&. On error, 1 is returned\&. \fBssh-add\fR(1) \fBscp\fR(1) : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amadmin.8 b/man/amadmin.8 index c4455b3..98aeabf 100644 --- a/man/amadmin.8 +++ b/man/amadmin.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amadmin .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMADMIN" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMADMIN" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amadmin \- administrative interface to control \fIAmanda\fR backups -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamadmin\fR\ 'u \fBamadmin\fR \fIconfig\fR \fIcommand\fR [\fIcommand_options\fR...] [\fB\-o\ \fR\fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmadmin\fR @@ -344,7 +194,6 @@ database\&. .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -359,7 +208,6 @@ file, \fIAmanda\fR will treat it as a new disk during the next run\&. .sp .5v -.EM yellow .RE .RE .PP @@ -454,7 +302,7 @@ amadmin: machine\-b:/home is set to a forced level 0 tonight\&. Undo the previous \fBforce\fR request for -\FC/home\F[] +/home on \fImachine\-b\fR\&. The other file systems will still get a full level 0 backup\&. .nf @@ -463,7 +311,7 @@ amadmin: force command for machine\-b:/home cleared\&. .fi .PP Locate backup images of -\FC/var\F[] +/var from \fImachine\-c\fR\&. The \fItape or file\fR @@ -488,7 +336,7 @@ date host disk lv tape or file file part status .fi .PP Forget about the -\FC/workspace\F[] +/workspace disk on \fImachine\-d\fR\&. If you do not also remove the disk from the \fBdisklist\fR(5) @@ -504,7 +352,7 @@ amadmin: NOTE: you\'ll have to remove these from the \fBdisklist\fR(5) yourself\ Find the next tape \fIAmanda\fR will use (in this case, -\FC123456\F[])\&. +123456)\&. .nf $ amadmin daily tape The next \fIAmanda\fR run should go onto tape 123456 or a new tape\&. @@ -561,7 +409,7 @@ TOTAL 241 12412187 7316312 731631 (estimated 8 runs per dumpcycle) \fBamrestore\fR(8), \fBamfetchdump\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amaespipe.8 b/man/amaespipe.8 index 383192e..c1ce373 100644 --- a/man/amaespipe.8 +++ b/man/amaespipe.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amaespipe .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMAESPIPE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMAESPIPE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amaespipe \- wrapper program for aespipe -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamaespipe\fR\ 'u \fBamaespipe\fR -.fam .SH "DESCRIPTION" .PP @@ -212,9 +62,9 @@ autodects encryption type and hash function from the encrypted image\&. \fBamcrypt\fR(8), \fBgpg\fR(1), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda-applications.7 b/man/amanda-applications.7 index 9c9e9e0..ab4c4b3 100644 --- a/man/amanda-applications.7 +++ b/man/amanda-applications.7 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-applications .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: Miscellanea -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-APPLICATIONS" "7" "01/22/2009" "Amanda 2\&.6\&.1" "Miscellanea" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-APPLICATIONS" "7" "04/10/2009" "Amanda 2\&.6\&.1p1" "Miscellanea" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-applications \- Application\-api for amanda .SH "DESCRIPTION" .PP @@ -228,14 +80,14 @@ This section lists the applications included with .PP \fBamanda.conf\fR(5) -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda-archive-format.5 b/man/amanda-archive-format.5 index 46bbb50..8488ab2 100644 --- a/man/amanda-archive-format.5 +++ b/man/amanda-archive-format.5 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-archive-format .\" Author: Dustin J. Mitchell -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: File formats and conventions -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-ARCHIVE\-FOR" "5" "01/22/2009" "Amanda 2\&.6\&.1" "File formats and conventions" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-ARCHIVE\-FOR" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-archive-format \- Format of amanda archive streams .SH "DESCRIPTION" .PP @@ -216,9 +68,9 @@ The final data record for each attribute has the high bit (the EOA bit) of its d .PP \fBamanda\fR(8), -.SH "Author" +.SH "AUTHOR" .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda-auth.7 b/man/amanda-auth.7 index 966a3d3..79a2b8a 100644 --- a/man/amanda-auth.7 +++ b/man/amanda-auth.7 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-auth .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: Miscellanea -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-AUTH" "7" "01/22/2009" "Amanda 2\&.6\&.1" "Miscellanea" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-AUTH" "7" "04/10/2009" "Amanda 2\&.6\&.1p1" "Miscellanea" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-auth \- Communication/Authentication methods between \fIAmanda\fR server and client .SH "DESCRIPTION" .PP @@ -817,19 +669,19 @@ As Amanda will not answer this question itself, you must manually make every con \fBamdump\fR(8), \fBamrecover\fR(8) : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBPaul Yeatman\fR <\&pyeatman@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda-changers.7 b/man/amanda-changers.7 index 7eaafd6..ef209b1 100644 --- a/man/amanda-changers.7 +++ b/man/amanda-changers.7 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-changers .\" Author: Dustin J. Mitchell -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: Miscellanea -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-CHANGERS" "7" "01/22/2009" "Amanda 2\&.6\&.1" "Miscellanea" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-CHANGERS" "7" "04/10/2009" "Amanda 2\&.6\&.1p1" "Miscellanea" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-changers \- Configuring and Using Amanda Changers .SH "DESCRIPTION" .PP @@ -180,17 +32,17 @@ The Amanda Changer API is in transition from version 1\&.0 \- driven by shell sc .SH "SPECIFYING CHANGERS" .PP Changer specifications are strings like -\FCchg\-disk:/my/vtapes\F[]\&. The -\FCchg\-\F[] +chg\-disk:/my/vtapes\&. The +chg\- prefix serves to differentiate changers from devices (see -\fBamanda-devices\fR(7))\&. The next portion (\FCdisk\F[], in this case) identifies the particular changer driver to use, and everything that follows the -\FC:\F[] +\fBamanda-devices\fR(7))\&. The next portion (disk, in this case) identifies the particular changer driver to use, and everything that follows the +: is interpreted by the driver\&. .PP A name which does not match this pattern, but which matches an old changer script (e\&.g\&., -\FCchg\-zd\-mtx\F[]), invokes the backward\-compatibility changer driver as -\FCchg\-compat:chg\-zd\-mtx\F[]\&. If the name does not match an old changer, then it is treated as an Amanda device, and is wrapped by the single\-device changer, e\&.g\&., -\FCchg\-single:tape:/dev/rmt/0\F[]\&. +chg\-zd\-mtx), invokes the backward\-compatibility changer driver as +chg\-compat:chg\-zd\-mtx\&. If the name does not match an old changer, then it is treated as an Amanda device, and is wrapped by the single\-device changer, e\&.g\&., +chg\-single:tape:/dev/rmt/0\&. .PP Changers which require additional parameters can also be described in \fBamanda.conf\fR(5) @@ -217,9 +69,9 @@ tpchanger "chg\-disk:/u01/vtapes" .PP This changer driver replaces the old \fBchg\-disk\fR, supporting parallel access to vtapes stored in directories named -\FCslotN\F[] +slotN in the directory specified after -\FCchg\-disk:\F[]\&. It does so by creating numbered "drives" so that simultaneous processes can access distinct slots\&. +chg\-disk:\&. It does so by creating numbered "drives" so that simultaneous processes can access distinct slots\&. .SS "chg\-disk (old)" .nf tapedev "file:/u01/vtapes" @@ -227,7 +79,7 @@ tpchanger "chg\-disk" .fi .PP This changer script supports sequential access to vtapes stored in directories named -\FCslotN\F[] +slotN in the directory specified by the \fItapedev\fR parameter\&. @@ -298,11 +150,11 @@ changerfile "chg\-rait\&.conf" .fi .PP This changer script constructs RAIT devices out of the devices provided by several "sub\-changers"\&. The configuration file specifies -\FCnchangers\F[], the number of subchangers, and then provides -\FCtpchanger\F[], -\FCchangerdev_N\F[], -\FCchangerfile_N\F[], and -\FCtpchanger_N\F[] +nchangers, the number of subchangers, and then provides +tpchanger, +changerdev_N, +changerfile_N, and +tpchanger_N for each sub\-changer, 1 through N\&. .SS "chg\-null" .nf @@ -314,7 +166,7 @@ This changer always provides the device "null:"\&. It is sometimes useful in con .SS "Unmaintained Changers" .PP Amanda has many other changer scripts and programs beyond those described here (see the -\FCchanger\-src/\F[] +changer\-src/ in the source directory), but most of these scripts are unmaintained and undocumented, and will be removed when the new changer API is fully implemented\&. .SH "SEE ALSO" .PP @@ -322,9 +174,9 @@ in the source directory), but most of these scripts are unmaintained and undocum \fBamanda\fR(8), \fBamanda.conf\fR(5), \fBamanda-devices\fR(7), -.SH "Author" +.SH "AUTHOR" .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda-client.conf.5 b/man/amanda-client.conf.5 index 86b7a51..2f70b0d 100644 --- a/man/amanda-client.conf.5 +++ b/man/amanda-client.conf.5 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-client.conf .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: File formats and conventions -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-CLIENT\&.CON" "5" "01/22/2009" "Amanda 2\&.6\&.1" "File formats and conventions" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-CLIENT\&.CON" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-client.conf \- Client configuration file for \fIAmanda\fR, the Advanced Maryland Automatic Network Disk Archiver .SH "DESCRIPTION" .PP @@ -199,7 +51,7 @@ Default: \fBamanda.conf\fR(5), this specifies the username that \fBamrecover\fR should send when connecting to the server\&. It should match the username specified in -\FC\&.amandahosts\F[] +\&.amandahosts on the server\&. .RE .PP @@ -381,7 +233,7 @@ section, which looks like this: define application\-tool "\fIname\fR" { \fIapplication\-option\fR \fIappli cation\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -422,7 +274,7 @@ section, which looks like this: .nf define script\-tool "\fIname\fR" { \fIscript\-option\fR \fIscript\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -559,7 +411,7 @@ keyword disallow the setting of that property on the server\&. \fBamcrypt\fR(8), \fBaespipe\fR(1), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amanda-devices.7 b/man/amanda-devices.7 index d566d88..1552679 100644 --- a/man/amanda-devices.7 +++ b/man/amanda-devices.7 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-devices .\" Author: Ian Turner -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: Miscellanea -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-DEVICES" "7" "01/22/2009" "Amanda 2\&.6\&.1" "Miscellanea" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-DEVICES" "7" "04/10/2009" "Amanda 2\&.6\&.1p1" "Miscellanea" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-devices \- Configuring and Using Amanda Devices .SH "DESCRIPTION" .PP @@ -434,7 +286,6 @@ Most devices are flexible enough to read a volume using a different block size t .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -446,7 +297,6 @@ Most devices are flexible enough to read a volume using a different block size t .PP The RAIT device does not support flexible block sizes, as its parity algorithm requires that all child devices have the same, fixed block size\&. .sp .5v -.EM yellow .RE .SS "DRIVER\-SPECIFIC PROPERTIES" .SS "S3 Device" @@ -557,14 +407,14 @@ READ_BUFFER_SIZE .PP \fBamanda.conf\fR(5), -.SH "Authors" +.SH "AUTHORS" .PP \fBIan Turner\fR <\&ian@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda-scripts.7 b/man/amanda-scripts.7 index 28a9320..87593a9 100644 --- a/man/amanda-scripts.7 +++ b/man/amanda-scripts.7 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda-scripts .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: Miscellanea -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\-SCRIPTS" "7" "01/22/2009" "Amanda 2\&.6\&.1" "Miscellanea" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\-SCRIPTS" "7" "04/10/2009" "Amanda 2\&.6\&.1p1" "Miscellanea" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda-scripts \- Configuring and using the Script API .SH "DESCRIPTION" .PP @@ -203,14 +55,14 @@ This section lists the scripts included with .PP \fBamanda.conf\fR(5) -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amanda.8 b/man/amanda.8 index be00f84..1e91374 100644 --- a/man/amanda.8 +++ b/man/amanda.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda \- The Open Source Backup Platform .SH "DESCRIPTION" .PP @@ -741,14 +593,14 @@ Last is the seldom\-edited file, which lists tapes that are currently active\&. These files are described in more detail in the following sections\&. .PP All files are stored in individual configuration directories, usually under -\FC/etc/amanda/\F[]\&. A site will often have more than one configuration\&. For example, it might have a +/etc/amanda/\&. A site will often have more than one configuration\&. For example, it might have a \fInormal\fR configuration for everyday backups and an \fIarchive\fR configuration for infrequent full archival backups\&. The configuration files would be stored under directories -\FC/etc/amanda/normal/\F[] +/etc/amanda/normal/ and -\FC/etc/amanda/archive/\F[], respectively\&. Part of the job of an +/etc/amanda/archive/, respectively\&. Part of the job of an \fIAmanda\fR administrator is to create, populate and maintain these directories\&. .SH "LOG FILES" @@ -757,10 +609,10 @@ All log and database files generated by \fIAmanda\fR go in corresponding directories somewhere\&. The exact location is controlled by entries in \fBamanda.conf\fR(5)\&. A typical location would be under -\FC/var/adm/amanda\F[]\&. For the above example, the files might go in -\FC/var/adm/amanda/normal/\F[] +/var/adm/amanda\&. For the above example, the files might go in +/var/adm/amanda/normal/ and -\FC/var/adm/amanda/archive/\F[]\&. +/var/adm/amanda/archive/\&. .PP As log files are no longer needed (no longer contain relevant information), \fIAmanda\fR @@ -802,12 +654,12 @@ administrator to remove them from this directory when desired\&. Index (backup image catalogue) files older than the full dump matching the oldest backup image for a given client and disk are removed by \fBamdump\fR at the end of each run\&. -.SH "Using Samba" +.SH "USING SAMBA" .PP For Samba access, \fIAmanda\fR needs a file on the Samba server (which may or may not also be the tape server) named -\FC/etc/amandapass\F[] +/etc/amandapass with share names, (clear text) passwords and (optional) domain names, in that order, one per line, whitespace separated\&. By default, the user used to connect to the PC is the same for all PC\'s and is compiled into \fIAmanda\fR\&. It may be changed on a host by host basis by listing it first in the password field followed by a percent sign and then the password\&. For instance: .nf @@ -863,99 +715,99 @@ Some examples: hosta .RS 4 Will match -\FChosta\F[], -\FCfoo\&.hosta\&.org\F[], and -\FChoSTA\&.dOMAIna\&.ORG\F[] +hosta, +foo\&.hosta\&.org, and +hoSTA\&.dOMAIna\&.ORG but not -\FChostb\F[]\&. +hostb\&. .RE .PP host .RS 4 Will match -\FChost\F[] +host but not -\FChosta\F[]\&. +hosta\&. .RE .PP host? .RS 4 Will match -\FChosta\F[] +hosta and -\FChostb\F[], but not -\FChost\F[]\&. +hostb, but not +host\&. .RE .PP ho*na .RS 4 Will match -\FChoina\F[] +hoina but not -\FCho\&.aina\&.org\F[]\&. +ho\&.aina\&.org\&. .RE .PP ho**na .RS 4 Will match -\FChoina\F[] +hoina and -\FCho\&.aina\&.org\F[]\&. +ho\&.aina\&.org\&. .RE .PP ^hosta .RS 4 Will match -\FChosta\F[] +hosta but not -\FCfoo\&.hosta\&.org\F[]\&. +foo\&.hosta\&.org\&. .RE .PP sda* .RS 4 Will match -\FC/dev/sda1\F[] +/dev/sda1 and -\FC/dev/sda12\F[]\&. +/dev/sda12\&. .RE .PP /opt .RS 4 Will match the disk -\FCopt\F[] +opt but not the host -\FCopt\F[]\&. +opt\&. .RE .PP (note dots:) \&.opt\&. .RS 4 Will match the host -\FCopt\F[] +opt but not the disk -\FCopt\F[]\&. +opt\&. .RE .PP / .RS 4 Will match the disk -\FC/\F[] +/ but no other disk\&. .RE .PP /usr .RS 4 Will match the disks -\FC/usr\F[] +/usr and -\FC/usr/local\F[]\&. +/usr/local\&. .RE .PP /usr$ .RS 4 Will match the disks -\FC/usr\F[] +/usr but not -\FC/usr/local\F[]\&. +/usr/local\&. .RE .SH "DATESTAMP EXPRESSION" .PP @@ -1071,7 +923,7 @@ Note that configuration overrides are not effective for tape changers, which sup .nf amdump \-otapedev=/dev/nst1 \-otpchanger=\'\' .fi -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amanda.conf.5 b/man/amanda.conf.5 index c0299af..6138906 100644 --- a/man/amanda.conf.5 +++ b/man/amanda.conf.5 @@ -1,161 +1,13 @@ +'\" t .\" Title: amanda.conf .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: File formats and conventions -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMANDA\&.CONF" "5" "01/22/2009" "Amanda 2\&.6\&.1" "File formats and conventions" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMANDA\&.CONF" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amanda.conf \- Main configuration file for \fIAmanda\fR, the Advanced Maryland Automatic Network Disk Archiver .SH "DESCRIPTION" .PP @@ -288,7 +140,6 @@ Some number of weeks (days*7)\&. .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -319,7 +170,6 @@ to indicate a false state\&. If no argument is given, \fBtrue\fR is assumed\&. .sp .5v -.EM yellow .RE .RE .SS "PARAMETER ORDER" @@ -405,7 +255,6 @@ Default: .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -422,7 +271,6 @@ This parameter may also be set in a specific before any \fBdumptype\fRs are defined\&. .sp .5v -.EM yellow .RE .RE .PP @@ -510,7 +358,7 @@ option\&. \fBtapedev\fR string .RS 4 Default: -\FCnull:\F[]\&. The device name, referencing the name of a "device" section in the configuration file\&. See +null:\&. The device name, referencing the name of a "device" section in the configuration file\&. See \fBamanda-devices\fR(7) for more information on device names\&. .sp @@ -558,7 +406,7 @@ If a tape changer is configured, choose one of the changer scripts (e\&.g\&. \fBchangerdev\fR string .RS 4 Default: -\FC/dev/null\F[]\&. A tape changer configuration parameter\&. Usage depends on the particular changer defined with the +/dev/null\&. A tape changer configuration parameter\&. Usage depends on the particular changer defined with the \fBtpchanger\fR option\&. .RE @@ -566,7 +414,7 @@ option\&. \fBchangerfile\fR string .RS 4 Default: -\FC/usr/adm/amanda/log/changer\-status\F[]\&. A tape changer configuration parameter\&. Usage depends on the particular changer defined with the +/usr/adm/amanda/log/changer\-status\&. A tape changer configuration parameter\&. Usage depends on the particular changer defined with the \fBtpchanger\fR option\&. .RE @@ -574,7 +422,7 @@ option\&. \fBruntapes\fR int .RS 4 Default: -\FC1\F[]\&. The maximum number of tapes used in a single run\&. If a tape changer is not configured, this option is not used and should be commented out of the configuration file\&. +1\&. The maximum number of tapes used in a single run\&. If a tape changer is not configured, this option is not used and should be commented out of the configuration file\&. .sp If a tape changer is configured, this may be set larger than one to let \fIAmanda\fR @@ -711,7 +559,7 @@ section\&. \fBinparallel\fR int .RS 4 Default: -\FC10\F[]\&. The maximum number of backups that +10\&. The maximum number of backups that \fIAmanda\fR will attempt to run in parallel\&. \fIAmanda\fR @@ -721,7 +569,7 @@ will stay within the constraints of network bandwidth and holding disk space ava \fBdisplayunit\fR "k|m|g|t" .RS 4 Default: -\FC"k"\F[]\&. The unit used to print many numbers, k=kilo, m=mega, g=giga, t=tera\&. +"k"\&. The unit used to print many numbers, k=kilo, m=mega, g=giga, t=tera\&. .RE .PP \fBdumporder\fR string @@ -742,7 +590,7 @@ B: largest bandwidth \fBmaxdumps\fR int .RS 4 Default: -\FC1\F[]\&. The maximum number of backups from a single host that +1\&. The maximum number of backups from a single host that \fIAmanda\fR will attempt to run in parallel\&. See also the \fBinparallel\fR @@ -800,7 +648,7 @@ and \fBbumpmult\fR \fI float\fR .RS 4 Default: -\FC1\&.5\F[]\&. The bump size multiplier\&. +1\&.5\&. The bump size multiplier\&. \fIAmanda\fR multiplies \fBbumpsize\fR @@ -836,7 +684,7 @@ file holding client hosts, disks and other client dumping information\&. \fBinfofile\fR \fI string\fR .RS 4 Default: -\FC/usr/adm/amanda/curinfo\F[]\&. The file or directory name for the historical information database\&. If +/usr/adm/amanda/curinfo\&. The file or directory name for the historical information database\&. If \fIAmanda\fR was configured to use DBM databases, this is the base file name for them\&. If it was configured to use text formated databases (the default), this is the base directory and within here will be a directory per client, then a directory per disk, then a text file of data\&. .RE @@ -844,7 +692,7 @@ was configured to use DBM databases, this is the base file name for them\&. If i \fBlogdir\fR \fI string\fR .RS 4 Default: -\FC/usr/adm/amanda\F[]\&. The directory for the +/usr/adm/amanda\&. The directory for the \fBamdump\fR and \fBlog\fR @@ -854,7 +702,7 @@ files\&. \fBindexdir\fR \fI string\fR .RS 4 Default -\FC/usr/adm/amanda/index\F[]\&. The directory where index files (backup image catalogues) are stored\&. Index files are only generated for filesystems whose +/usr/adm/amanda/index\&. The directory where index files (backup image catalogues) are stored\&. Index files are only generated for filesystems whose \fBdumptype\fR has the \fBindex\fR @@ -873,7 +721,7 @@ maintains this file with information about the active set of tapes\&. \fBdevice_output_buffer_size\fR \fI int\fR .RS 4 Default: -\FC1280k\F[]\&. Controls the amount of memory used by +1280k\&. Controls the amount of memory used by \fIAmanda\fR to hold data as it is read from the network or disk before it is written to the output device\&. Higher values may be useful on fast tape drives and optical media\&. .sp @@ -883,7 +731,7 @@ The default unit is bytes if it is not specified\&. \fBtapebufs\fR \fI int\fR .RS 4 Default: -\FC20\F[]\&. This option is deprecated; use the +20\&. This option is deprecated; use the \fBdevice_output_buffer_size\fR directive instead\&. \fBtapebufs\fR @@ -893,7 +741,7 @@ works the same way, but the number specified is multiplied by the device blocksi \fBreserve\fR \fI number\fR .RS 4 Default: -\FC100\F[]\&. The part of holding\-disk space that should be reserved for incremental backups if no tape is available, expressed as a percentage of the available holding\-disk space (0\-100)\&. By default, when there is no tape to write to, degraded mode (incremental) backups will be performed to the holding disk\&. If full backups should also be allowed in this case, the amount of holding disk space reserved for incrementals should be lowered\&. +100\&. The part of holding\-disk space that should be reserved for incremental backups if no tape is available, expressed as a percentage of the available holding\-disk space (0\-100)\&. By default, when there is no tape to write to, degraded mode (incremental) backups will be performed to the holding disk\&. If full backups should also be allowed in this case, the amount of holding disk space reserved for incrementals should be lowered\&. .RE .PP \fBautoflush\fR \fI bool\fR @@ -972,7 +820,6 @@ the amount of space to display before the column (used to get whitespace between .\} the width of the column itself\&. If set to a negative value, the width will be calculated on demand to fit the largest entry in this column\&. .RE -.RS 4 Here is an example: .sp .nf @@ -1151,7 +998,7 @@ file may define one or more holding disks used as buffers to hold backup images .nf holdingdisk \fIname\fR { \fIholdingdisk\-option\fR \fIholdingdisk\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -1169,7 +1016,7 @@ Default: \fBdirectory\fR \fI disk\fR .RS 4 Default: -\FC/dumps/amanda\F[]\&. The path to this holding area\&. +/dumps/amanda\&. The path to this holding area\&. .RE .PP \fBuse\fR \fI int\fR @@ -1211,7 +1058,7 @@ section, which looks like this: .nf define dumptype "\fIname\fR" { \fIdumptype\-option\fR \fIdumptype\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -1293,7 +1140,7 @@ and \fBbumpmult\fR \fI float\fR .RS 4 Default: -\FC1\&.5\F[]\&. The bump size multiplier\&. +1\&.5\&. The bump size multiplier\&. \fIAmanda\fR multiplies \fBbumpsize\fR @@ -1323,8 +1170,8 @@ Default: \fBcomprate\fR \fIfloat\fR [, \fIfloat\fR ] .RS 4 Default: -\FC0\&.50\F[], -\FC0\&.50\F[]\&. The expected full and incremental compression factor for dumps\&. It is only used if +0\&.50, +0\&.50\&. The expected full and incremental compression factor for dumps\&. It is only used if \fIAmanda\fR does not have any history information on compression rates for a filesystem, so should not usually need to be set\&. However, it may be useful for the first time a very large filesystem that compresses very little is backed up\&. .RE @@ -1521,12 +1368,12 @@ For exclude list "\&.amanda\&.excludes" .fi the actual file used would be -\FC/var/\&.amanda\&.excludes\F[] +/var/\&.amanda\&.excludes for a backup of -\FC/var\F[], -\FC/usr/local/\&.amanda\&.excludes\F[] +/var, +/usr/local/\&.amanda\&.excludes for a backup of -\FC/usr/local\F[], and so on\&. +/usr/local, and so on\&. .RE .PP \fBholdingdisk\fR [ never|auto|required ] @@ -1594,7 +1441,6 @@ Include expressions must always be specified as relative to the head directory o .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -1607,7 +1453,6 @@ For globbing to work at all, even the limited single level, the top level direct \fIAmanda\fR user\&. .sp .5v -.EM yellow .RE With the \fBappend\fR @@ -1645,7 +1490,7 @@ Default: \fBmaxdumps\fR \fI int\fR .RS 4 Default: -\FC1\F[]\&. The maximum number of backups from a single host that +1\&. The maximum number of backups from a single host that \fIAmanda\fR will attempt to run in parallel\&. See also the main section parameter \fBinparallel\fR\&. @@ -1654,7 +1499,7 @@ will attempt to run in parallel\&. See also the main section parameter \fBmaxpromoteday\fR \fI int\fR .RS 4 Default: -\FC10000\F[]\&. The maximum number of day for a promotion, set it 0 if you don\'t want promotion, set it to 1 or 2 if your disks get overpromoted\&. +10000\&. The maximum number of day for a promotion, set it 0 if you don\'t want promotion, set it to 1 or 2 if your disks get overpromoted\&. .RE .PP \fBpriority\fR \fI string\fR @@ -1712,9 +1557,9 @@ keyword append the values to the list of values for that property\&. .RS 4 Default: \fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&. -\FC/etc/dumpdates\F[] +/etc/dumpdates for DUMP or -\FC/usr/local/var/amanda/gnutar\-lists\F[] +/usr/local/var/amanda/gnutar\-lists for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&. .RE .PP @@ -1744,7 +1589,7 @@ has scheduled an incremental backup, these disks will be skipped\&. .RS 4 Default: \fInone\fR\&. Backups will not start until after this time of day\&. The value should be hh*100+mm, e\&.g\&. 6:30PM (18:30) would be entered as -\FC1830\F[]\&. +1830\&. .RE .PP \fBstrategy\fR \fI string\fR @@ -1886,7 +1731,7 @@ section, which looks like this in the config file: .nf define tapetype "\fIname\fR" { \fItapetype\-option\fR \fItapetype\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -1912,7 +1757,7 @@ Default: \fBlength\fR \fI int\fR .RS 4 Default: -\fI2000 kbytes\fR\&. How much data will fit on a tape\&. +\fI2000 kbytes\fR\&. How much data will fit on a tape, expressed in kbytes\&. .sp Note that this value is only used by \fIAmanda\fR @@ -1920,21 +1765,17 @@ to schedule which backups will be run\&. Once the backups start, \fIAmanda\fR will continue to write to a tape until it gets an error, regardless of what value is entered for \fBlength\fR -(but see the section OUTPUT DRIVERS in the -\fBamanda\fR(8) -manpage for exceptions)\&. -.sp -The default unit is bytes if it is not specified\&. +(but see +\fBamanda-devices\fR(7) +for exceptions)\&. .RE .PP \fBblocksize\fR \fI int\fR .RS 4 Default: -\fI32 kbytes\fR\&. How much data will be written in each tape record\&. This is equivalent to the +\fI32 kbytes\fR\&. How much data will be written in each tape record, expressed in kbytes\&. This is similar to the \fIBLOCK_SIZE\fR -device property\&. -.sp -The default unit is Kbytes if it is not specified\&. +device property, but if the blocksize is not a multiple of 1024 bytes, then this parameter cannot be used to specify it, and the property must be used instead\&. .RE .PP \fBreadblocksize\fR \fI int\fR @@ -1995,7 +1836,7 @@ section, which looks like this: .nf define interface "\fIname\fR" { \fIinterface\-option\fR \fIinterface\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -2041,7 +1882,7 @@ section, which looks like this: .nf define application\-tool "\fIname\fR" { \fIapplication\-option\fR \fIapplication\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -2082,7 +1923,7 @@ section, which looks like this: .nf define script\-tool "\fIname\fR" { \fIscript\-option\fR \fIscript\-value\fR - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -2232,7 +2073,7 @@ define device \fIname\fR { commend "\fIcomment (optional)\fR" tapedev "\fIdevice\-specifier\fR" device_property "\fIprop\-name\fR" "\fIprop\-value\fR" - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP @@ -2263,14 +2104,12 @@ define changer \fIname\fR { tpchanger "\fIchanger\-type\fR" changerdev "\fIdevice\-name\fR" changerfile "\fIstate\-file\fR" - \FC\&.\&.\&.\F[] + \&.\&.\&. } .fi .PP \fIname\fR is the user\-specified name of this device\&. The remaining parameters are specific to the changer type selected\&. -.PP -TODO: more detail here once it\'s known .SH "SEE ALSO" .PP @@ -2279,7 +2118,7 @@ TODO: more detail here once it\'s known \fBamcrypt\fR(8), \fBaespipe\fR(1), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amarchiver.8 b/man/amarchiver.8 index 36cf6da..1faa558 100644 --- a/man/amarchiver.8 +++ b/man/amarchiver.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amarchiver .\" Author: Dustin J. Mitchell -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMARCHIVER" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMARCHIVER" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amarchiver \- Create, extract or list amanda archive -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamarchiver\fR\ 'u \fBamarchiver\fR \-\-version|\-\-create|\-\-extract|\-\-list [\-\-verbose] [\-\-file\ \fIfile\fR] [\fIfilename\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmarchiver\fR @@ -216,14 +66,14 @@ Create, list or extract from the given file instead of stdin/stdout\&. \fBamanda\fR(8) .PP \fBamanda-archive-format\fR(5) -.SH "Authors" +.SH "AUTHORS" .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amcheck.8 b/man/amcheck.8 index be35fcf..a0d09a5 100644 --- a/man/amcheck.8 +++ b/man/amcheck.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcheck .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCHECK" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCHECK" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcheck \- run \fIAmanda\fR self\-checks -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcheck\fR\ 'u \fBamcheck\fR [\-am] [\-w] [\-sclt] [\-M\ \fIaddress\fR] \fIconfig\fR [\fIhost\fR\ [\fIdisk\fR...]...] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmcheck\fR @@ -503,14 +353,14 @@ expected to be a directory, but it is something else (e\&.g\&. file)\&. .RE .PP -WARNING: info file \FCfile\F[]: does not exist +WARNING: info file file: does not exist .RS 4 (warning) File \fIfile\fR does not exist in the text format database\&. Since the parent directories do exist, the file should already have been created\&. .RE .PP -ERROR: info file \FCname\F[]: not a file +ERROR: info file name: not a file .RS 4 (error) \fBAmcheck\fR @@ -519,14 +369,14 @@ expected to be a file, but it is something else (e\&.g\&. file)\&. .RE .PP -ERROR: info file \FCfile\F[]: not readable +ERROR: info file file: not readable .RS 4 (error) The text format database file \fIfile\fR is not readable\&. .RE .PP -ERROR: log file \FCfile\F[]: not writable +ERROR: log file file: not writable .RS 4 (error) Log file \fIfile\fR @@ -559,13 +409,13 @@ WARNING: tapedev is /dev/null, dumps will be thrown away parameter in \fBamanda\&.conf\fR is set to -\FC/dev/null\F[] +/dev/null and \fIAmanda\fR uses that when debugging to throw all the dump images away\&. .RE .PP -WARNING: hold file \FCfile\F[] exists +WARNING: hold file file exists .RS 4 (info) Hold file \fIfile\fR @@ -617,7 +467,6 @@ option) to allow for unexpected overruns\&. .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -630,7 +479,6 @@ Even though this message is listed as a warning, it causes \fBamcheck\fR to exit with a non\-zero status\&. .sp .5v -.EM yellow .RE .RE .PP @@ -745,7 +593,7 @@ or were running because a log file or amdump file exists\&. If they are not running, you probably need to run \fBamcleanup\fR to clear up a previous failure\&. Otherwise, you need to wait until they complete before running -\fBamcheck\fR\FC\&.\F[] +\fBamcheck\fR\&. .RE .PP NOTE: skipping tape checks @@ -839,7 +687,7 @@ The exit code of \fBamcheck\fR is one of: \fBamanda\fR(8), \fBamdump\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amcheckdb.8 b/man/amcheckdb.8 index eb8bc42..7b20625 100644 --- a/man/amcheckdb.8 +++ b/man/amcheckdb.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcheckdb .\" Author: Adrian T. Filipi-Martin -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCHECKDB" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCHECKDB" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcheckdb \- check \fIAmanda\fR database for tape consistency -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcheckdb\fR\ 'u \fBamcheckdb\fR \fIconfig\fR -.fam .SH "DESCRIPTION" .PP \fBAmcheckdb\fR @@ -208,7 +58,7 @@ Ready\&. \fBamrmtape\fR(8), \fBamanda\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBAdrian T\&. Filipi\-Martin\fR <\&atf3r@cs\&.virginia\&.edu\&> .PP diff --git a/man/amcheckdump.8 b/man/amcheckdump.8 index c3140e6..7709334 100644 --- a/man/amcheckdump.8 +++ b/man/amcheckdump.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcheckdump .\" Author: Ian Turner -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCHECKDUMP" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCHECKDUMP" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcheckdump \- check the results of an \fIAmanda\fR dump -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcheckdump\fR\ 'u \fBamcheckdump\fR \fIconfig\fR [\-\-timestamp|\-t\ \fItimestamp\fR] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmcheckdump\fR @@ -191,7 +41,7 @@ If a changer is available, it is used to load the required tapes\&. Otherwise, t See the "\fBCONFIGURATION OVERRIDE\fR" section in \fBamanda\fR(8) for information on the -\FC\-o\F[] +\-o option\&. .SH "EXAMPLE" .PP @@ -206,9 +56,9 @@ amcheckdump MYCONFIG \-\-timestamp 19780615 .PP \fBamanda\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBIan Turner\fR <\&ian@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amcleanup.8 b/man/amcleanup.8 index 9148da2..aafebae 100644 --- a/man/amcleanup.8 +++ b/man/amcleanup.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcleanup .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCLEANUP" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCLEANUP" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcleanup \- run the \fIAmanda\fR cleanup process after a failure -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcleanup\fR\ 'u \fBamcleanup\fR [\fB\-k\fR] [\fB\-p\fR] [\fB\-v\fR] \fIconfig\fR -.fam .SH "DESCRIPTION" .PP \fBAmcleanup\fR @@ -218,7 +68,7 @@ cleanup process by hand after a failure\&. .fi .PP Putting the following line in a system boot script (e\&.g\&. -\FC/etc/rc\&.local\F[]) runs the +/etc/rc\&.local) runs the \fIAmanda\fR cleanup process as part of the reboot, eliminating the need to run it by hand\&. .nf @@ -236,7 +86,7 @@ amcleanup: no unprocessed logfile to clean up\&. \fBamanda\fR(8), \fBamdump\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amcrypt-ossl-asym.8 b/man/amcrypt-ossl-asym.8 index e9da0bb..a0cd5f4 100644 --- a/man/amcrypt-ossl-asym.8 +++ b/man/amcrypt-ossl-asym.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcrypt-ossl-asym .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCRYPT\-OSSL\-ASYM" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCRYPT\-OSSL\-ASYM" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcrypt-ossl-asym \- crypt program for \fIAmanda\fR asymmetric data encryption using OpenSSL -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcrypt\-ossl\-asym\fR\ 'u \fBamcrypt\-ossl\-asym\fR [\-d] -.fam .SH "DESCRIPTION" .PP @@ -252,13 +102,13 @@ user\&. \fBopenssl\fR(1), \fBamcrypt-ossl\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE -.SH "Notes" +.SH "NOTES" .IP " 1." 4 www.openssl.org .RS 4 diff --git a/man/amcrypt-ossl.8 b/man/amcrypt-ossl.8 index 9e508d1..3bdc6d9 100644 --- a/man/amcrypt-ossl.8 +++ b/man/amcrypt-ossl.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcrypt-ossl .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCRYPT\-OSSL" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCRYPT\-OSSL" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcrypt-ossl \- crypt program for \fIAmanda\fR symmetric data encryption using OpenSSL -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcrypt\-ossl\fR\ 'u \fBamcrypt\-ossl\fR [\-d] -.fam .SH "DESCRIPTION" .PP @@ -213,13 +63,13 @@ user\&. \fBopenssl\fR(1), \fBamcrypt-ossl-asym\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE -.SH "Notes" +.SH "NOTES" .IP " 1." 4 www.openssl.org .RS 4 diff --git a/man/amcrypt.8 b/man/amcrypt.8 index 90d205c..92ec9d0 100644 --- a/man/amcrypt.8 +++ b/man/amcrypt.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcrypt .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCRYPT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCRYPT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcrypt \- reference crypt program for \fIAmanda\fR symmetric data encryption -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcrypt\fR\ 'u \fBamcrypt\fR -.fam .SH "DESCRIPTION" .PP @@ -196,7 +46,7 @@ calls and pass the \fBpassphrase\fR through file descriptor 3\&. The passphrase should be stored in ~amanda/\&.am_passphrase\&. -.SH "How to create encryption keys for amcrypt" +.SH "HOW TO CREATE ENCRYPTION KEYS FOR AMCRYPT" .PP 1\&. Create 65 random encryption keys and encrypt those keys using gpg\&. Reading from /dev/random may take indefinitely long if kernel\'s random entropy pool is empty\&. If that happens, do some other work on some other console (use keyboard, mouse and disks)\&. .PP @@ -210,7 +60,7 @@ echo my_secret_passphrase > ~amanda/\&.am_passphrase chown amanda:disk ~amanda/\&.am_passphrase chmod 700 ~amanda/\&.am_passphrase .fi -.SH "Key and Passphrase" +.SH "KEY AND PASSPHRASE" .PP \fBamcrypt\fR @@ -227,9 +77,9 @@ be recovered with the correct key and passphrase\&. \fBamaespipe\fR(8), \fBgpg\fR(1), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amcryptsimple.8 b/man/amcryptsimple.8 index 4e3728f..9736731 100644 --- a/man/amcryptsimple.8 +++ b/man/amcryptsimple.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amcryptsimple .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMCRYPTSIMPLE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMCRYPTSIMPLE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amcryptsimple \- reference simple crypt program for \fIAmanda\fR symmetric data encryption -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamcryptsimple\fR\ 'u \fBamcryptsimple\fR to be called by \fIAmanda\fR only -.fam .SH "DESCRIPTION" .PP @@ -194,7 +44,7 @@ data and uses the same passphrase to decrypt the backup data\&. \fBamcryptsimple\fR uses AES256 as the symmetric cipher\&. -.SH "How to Create Passphrase" +.SH "HOW TO CREATE PASSPHRASE" Store the passphrase inside the home\-directory of the AMANDA\-user($amanda_user) and protect it with proper permissions: @@ -219,9 +69,9 @@ provide public\-key data encryption through \fBamrestore\fR(8), \fBgpg\fR(1), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amdevcheck.8 b/man/amdevcheck.8 index 452c445..28f207f 100644 --- a/man/amdevcheck.8 +++ b/man/amdevcheck.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amdevcheck .\" Author: Ian Turner -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMDEVCHECK" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMDEVCHECK" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amdevcheck \- Validate an \fIAmanda\fR device and volume\&. -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamdevcheck\fR\ 'u \fBamdevcheck\fR \fIconfig\fR [\fIdevice\ name\fR] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP @@ -256,9 +106,9 @@ Where text provides a human\-readable description of the problem\&. \fBamanda\fR(8), \fBammt\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBIan Turner\fR <\&ian@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amdump.8 b/man/amdump.8 index 0889853..e53875b 100644 --- a/man/amdump.8 +++ b/man/amdump.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amdump .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMDUMP" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMDUMP" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amdump \- back up all disks in an \fIAmanda\fR configuration -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamdump\fR\ 'u \fBamdump\fR \fIconfig\fR [\fIhost\fR\ [\fIdisk\fR...]...] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmdump\fR @@ -269,7 +119,7 @@ The exit code of \fBamdump\fR is the ORed value of: \fBamflush\fR(8), \fBcron\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amfetchdump.8 b/man/amfetchdump.8 index af28b2e..b641351 100644 --- a/man/amfetchdump.8 +++ b/man/amfetchdump.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amfetchdump .\" Author: John Stange -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMFETCHDUMP" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMFETCHDUMP" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amfetchdump \- extract backup images from multiple \fIAmanda\fR tapes\&. -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamfetchdump\fR\ 'u \fBamfetchdump\fR [\-pcClawns] [\-d\ \fIdevice\fR] [\-O\ \fIdirectory\fR] [\-b\ \fIblocksize\fR] \fIconfig\fR \fIhostname\fR [\fIdisk\fR\ [\ \fIdate\fR\ [\ \fIlevel\fR\ [\ \fIhostname\fR\ [\&.\&.\&.]\ ]\ ]\ ]] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmfetchdump\fR @@ -250,7 +100,6 @@ will attempt to read pieces of a split file from tape in order, so that it can a .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -261,7 +110,6 @@ will attempt to read pieces of a split file from tape in order, so that it can a .br This requires at least double the size of your dump in free disk space, in order to build the final assembled dumpfile\&. .sp .5v -.EM yellow .RE This behavior is implicitly invoked in circumstances where knowing the location of all dumps on tape in advance is not possible, such as when you are restoring without log files\&. .RE @@ -318,7 +166,7 @@ instead\&. \fBtar\fR(1), \fBrestore\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJohn Stange\fR <\&building@nap\&.edu\&> .RS 4 @@ -327,5 +175,5 @@ National Academies Press .PP \fBIan Turner\fR <\&ian@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amflush.8 b/man/amflush.8 index 26a50ee..aa7c9e3 100644 --- a/man/amflush.8 +++ b/man/amflush.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amflush .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMFLUSH" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMFLUSH" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amflush \- flush \fIAmanda\fR backup files from holding disk to tape -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamflush\fR\ 'u \fBamflush\fR [\-b] [\-f] [\-s] [\-D\ \fIdatestamp\fR] \fIconfig\fR [\fIhost\fR\ [\fIdisk\fR...]...] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmflush\fR @@ -251,7 +101,7 @@ for any non\-empty work directories\&. It then prompts you to select a directory or to process all of the directories\&. The work directories in the holding disks are named by the date at the time \fBamdump\fR was run, e\&.g\&. -\FC19910215\F[]\&. +19910215\&. .PP See the \fBamanda\fR(8) @@ -306,7 +156,7 @@ The exit code of \fBamflush\fR is the ORed value of: \fBamanda\fR(8), \fBamdump\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amgetconf.8 b/man/amgetconf.8 index 07e7524..3946f56 100644 --- a/man/amgetconf.8 +++ b/man/amgetconf.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amgetconf .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMGETCONF" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMGETCONF" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amgetconf \- look up configuration parameters and manipulate debug logs -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamgetconf\fR\ 'u \fBamgetconf\fR [\fI\-l|\-\-list\fR] [\-o\ \fIconfigoption\fR]... [\fI\-\-client\fR] [\fI\-\-execute\-where\ client|server\fR] [\fIconfig\fR] \fIparameter\fR -.fam .SH "DESCRIPTION" .PP \fBAmgetconf\fR @@ -193,7 +43,7 @@ is always case\-insensitive, and \'\-\' and \'_\' are treated as identical, just See the "\fBCONFIGURATION OVERRIDE\fR" section in \fBamanda\fR(8) for information on the -\FC\-o\F[] +\-o option\&. .SS "AMANDA CONFIGURATION" .PP @@ -203,146 +53,146 @@ is a configuration keyword (from \fBamanda.conf\fR(5)), then amgetconf will return the corresponding value\&. For keywords which can take multiple values, amgetconf will return all values, one on each line\&. .PP Values in configuration subsections are specified with parameters of the form -\FCTYPE:NAME:PARAMETER\F[], where -\FCTYPE\F[] +TYPE:NAME:PARAMETER, where +TYPE is the subsection type (one of -\FCdumptype\F[], -\FCtapetype\F[], -\FCinterface\F[], -\FCholdingdisk\F[], -\FCapplication\-tool\F[], or -\FCscript\-tool\F[]; -\FCNAME\F[] +dumptype, +tapetype, +interface, +holdingdisk, +application\-tool, or +script\-tool; +NAME is the name of the subsection (e\&.g\&., -\FCuser\-tar\F[]), and -\FCPARAMETER\F[] +user\-tar), and +PARAMETER is the name of the disired parameter within that subsection\&. .PP The -\FC\-\-list\F[] +\-\-list option lists the subsections of a certain type, where the type is givein as the parameter\&. .PP The -\FC\-\-client\F[] +\-\-client option is equivalent to -\FC\-\-execute\-where server\F[] +\-\-execute\-where server (below)\&. .PP The -\FC\-\-execute\-where\F[] +\-\-execute\-where option tells amgetconf whether to operate on the client or the server; the server is the default\&. .SS "BUILD CONFIGURATION" .PP If \fIparameter\fR begins with -\FCbuild\&.\F[], then the following name is a build environment variable\&. Variables without a value (e\&.g\&. -\FCXFSDUMP\F[] +build\&., then the following name is a build environment variable\&. Variables without a value (e\&.g\&. +XFSDUMP on a system that does not support that type of file system) will not report an error and will return an empty string as the value\&. Some boolean variables (e\&.g\&. \fIUSE_AMANDAHOSTS\fR) will return -\FC1\F[] +1 if the flag is set or an empty string if it is not, while others return -\FCyes\F[] +yes or -\FCno\F[], as indicated below (the difference is historical)\&. +no, as indicated below (the difference is historical)\&. .PP Combining the -\FC\-\-list\F[] +\-\-list option with the parameter -\FCbuild\F[] +build will enumerate all available build parameters\&. .PP \fBBuild Parameters\fR .PP -\FCbindir\F[], \FCsbindir\F[], \FClibexecdir\F[], \FCmandir\F[] +bindir, sbindir, libexecdir, mandir .RS 4 Install directories .RE .PP -\FCAMANDA_TMPDIR\F[], \FCCONFIG_DIR\F[], \FCAMANDA_DBGDIR\F[], \FCGNUTAR_LISTED_INCREMENTAL_DIR\F[] +AMANDA_TMPDIR, CONFIG_DIR, AMANDA_DBGDIR, GNUTAR_LISTED_INCREMENTAL_DIR .RS 4 Runtime directories .RE .PP -\FClisted_inc_dir\F[] +listed_inc_dir .RS 4 Same as -\FCGNUTAR_LISTED_INCREMENTAL_DIR\F[] +GNUTAR_LISTED_INCREMENTAL_DIR .RE .PP -\FCCC\F[], \FCVERSION\F[], \FCASSERTIONS\F[], \FCLOCKING\F[], \FCUSE_VERSION_SUFFIXES\F[] +CC, VERSION, ASSERTIONS, LOCKING, USE_VERSION_SUFFIXES .RS 4 Build information\&. -\FCASSERTIONS\F[] +ASSERTIONS is 1 or empty, while -\FCUSE_VERSION_SUFFIXES\F[] +USE_VERSION_SUFFIXES is yes/no\&. .RE .PP -\FCDUMP\F[], \FCRESTORE\F[], \FCVDUMP\F[], \FCVRESTORE\F[], \FCXFSDUMP\F[], \FCXFSRESTORE\F[], \FCVXDUMP\F[], \FCVXRESTORE\F[], \FCSAMBA_CLIENT\F[], \FCGNUTAR\F[], \FCSTAR\F[], \FCCOMPRESS_PATH\F[], \FCUNCOMPRESS_PATH\F[] +DUMP, RESTORE, VDUMP, VRESTORE, XFSDUMP, XFSRESTORE, VXDUMP, VXRESTORE, SAMBA_CLIENT, GNUTAR, STAR, COMPRESS_PATH, UNCOMPRESS_PATH .RS 4 Paths to various utility progarms (empty if they are not found or not used) .RE .PP -\FCAIX_BACKUP\F[] +AIX_BACKUP .RS 4 Is -\FCDUMP\F[] +DUMP the AIX backup program? (empty or 1) .RE .PP -\FCDUMP_RETURNS_1\F[] +DUMP_RETURNS_1 .RS 4 Does -\FCDUMP\F[] +DUMP return 1 on success? (empty or 1) .RE .PP -\FCBSD_SECURITY\F[], \FCBSDUDP_SECURITY\F[], \FCBSDTCP_SECURITY\F[], \FCKRB4_SECURITY\F[], \FCKRB5_SECURITY\F[], \FCSSH_SECURITY\F[], \FCRSH_SECURITY\F[] +BSD_SECURITY, BSDUDP_SECURITY, BSDTCP_SECURITY, KRB4_SECURITY, KRB5_SECURITY, SSH_SECURITY, RSH_SECURITY .RS 4 Indicate which authentication mechanisms are available (yes or no)\&. .RE .PP -\FCUSE_AMANDAHOSTS\F[] +USE_AMANDAHOSTS .RS 4 Should the "bsd" authentication mechanism use -\FCamandahosts\F[]? (yes or no)\&. +amandahosts? (yes or no)\&. .RE .PP -\FCAMANDA_DEBUG_DAYS\F[] +AMANDA_DEBUG_DAYS .RS 4 Number of days after which debug logs are deleted\&. .RE .PP -\FCDEFAULT_SERVER\F[], \FCDEFAULT_CONFIG\F[], \FCDEFAULT_TAPE_SERVER\F[], \FCDEFAULT_TAPE_DEVICE\F[] +DEFAULT_SERVER, DEFAULT_CONFIG, DEFAULT_TAPE_SERVER, DEFAULT_TAPE_DEVICE .RS 4 Default values for configuration parameters .RE .PP -\FCCLIENT_LOGIN\F[] +CLIENT_LOGIN .RS 4 Userid under which the client runs (from -\FC\-\-with\-user\F[])\&. +\-\-with\-user)\&. .RE .PP -\FCUSE_RUNDUMP\F[] +USE_RUNDUMP .RS 4 Should Amanda use the -\FCrundump\F[] +rundump wrapper? (empty or 1) .RE .PP -\FCCHECK_USERID\F[] +CHECK_USERID .RS 4 Does Amanda check that userids are correct? (empty or 1) .RE .PP -\FCCOMPRESS_SUFFIX\F[], \FCCOMPRESS_FAST_OPT\F[], \FCCOMPRESS_BEST_OPT\F[], \FCUNCOMPRESS_OPT\F[] +COMPRESS_SUFFIX, COMPRESS_FAST_OPT, COMPRESS_BEST_OPT, UNCOMPRESS_OPT .RS 4 Command\-line options for the compression program\&. .RE .PP -\FCTICKET_LIFETIME\F[], \FCSERVER_HOST_PRINCIPAL\F[], \FCSERVER_HOST_INSTANCE\F[], \FCSERVER_HOST_KEY_FILE\F[], \FCCLIENT_HOST_PRINCIPAL\F[], \FCCLIENT_HOST_INSTANCE\F[], \FCCLIENT_HOST_KEY_FILE\F[] +TICKET_LIFETIME, SERVER_HOST_PRINCIPAL, SERVER_HOST_INSTANCE, SERVER_HOST_KEY_FILE, CLIENT_HOST_PRINCIPAL, CLIENT_HOST_INSTANCE, CLIENT_HOST_KEY_FILE .RS 4 Kerberos parameters\&. .RE @@ -351,7 +201,6 @@ Kerberos parameters\&. .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -362,7 +211,6 @@ Kerberos parameters\&. .br That this application is responsible for debug logs is a historical quirk, but the functionality is widely used\&..sp .5v -.EM yellow .RE .PP If @@ -442,9 +290,9 @@ keyword)\&. \fBamanda\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amgpgcrypt.8 b/man/amgpgcrypt.8 index 94c993c..a5d2e60 100644 --- a/man/amgpgcrypt.8 +++ b/man/amgpgcrypt.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amgpgcrypt .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMGPGCRYPT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMGPGCRYPT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amgpgcrypt \- reference crypt program for \fIAmanda\fR public\-key data encryption -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamgpgcrypt\fR\ 'u \fBamgpgcrypt\fR to be called by \fIAmanda\fR only -.fam .SH "DESCRIPTION" .PP @@ -194,7 +44,7 @@ uses the public key to encrypt the data and uses the private key to decrypt the \fIAmanda\fR backup data\&. Thus, passphrase is only required at the time of data restore\&. -.SH "Key and Passphrase" +.SH "KEY AND PASSPHRASE" .PP \fBamgpgcrypt\fR @@ -205,7 +55,7 @@ backup data\&. It is very important to store, manage and protect the key and the passphrase properly\&. Encrypted backup data can \fBonly\fR be recovered with the correct key and passphrase\&. -.SH "How to create encryption keys and Passphrase for amgpgcrypt" +.SH "HOW TO CREATE ENCRYPTION KEYS AND PASSPHRASE FOR AMGPGCRYPT" .PP Store the passphrase that you used in following "gpg \-\-gen\-key" command inside the home\-directory of the AMANDA\-user($amanda_user) and protect it with proper permissions: @@ -273,7 +123,7 @@ pub 1024D/4417A8CB 2006\-02\-07 amandabackup (gpg keys for amandabackup) Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB sub 1024g/8C3A6A78 2006\-02\-07 [expires: 2006\-08\-06] .fi -.SH "Files" +.SH "FILES" .PP \fB$AMANDA_HOME/\&.gnupg/pubring\&.gpg\fR .RS 4 @@ -306,9 +156,9 @@ calls gpg with mdc disabled \fBamrestore\fR(8), \fBgpg\fR(1), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amgtar.8 b/man/amgtar.8 index 1a03bcd..19b72b2 100644 --- a/man/amgtar.8 +++ b/man/amgtar.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amgtar .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMGTAR" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMGTAR" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amgtar \- Amanda Application to interface with GNU Tar .SH "DESCRIPTION" .PP @@ -289,14 +141,14 @@ List all regex (POSIX Extended Regular Expression syntax) that are strange outpu \fBamanda.conf\fR(5), \fBamanda-applications\fR(7) -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amlabel.8 b/man/amlabel.8 index 918f270..02c2527 100644 --- a/man/amlabel.8 +++ b/man/amlabel.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amlabel .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMLABEL" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMLABEL" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amlabel \- label an \fIAmanda\fR tape -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamlabel\fR\ 'u \fBamlabel\fR [\-f] \fIconfig\fR \fIlabel\fR [slot\ \fIslot\fR] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP All @@ -316,7 +166,7 @@ with a rewinding tape device name instead of a non\-rewinding device name for \fBamdump\fR(8), \fBamflush\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amoverview.8 b/man/amoverview.8 index f6296c6..57868af 100644 --- a/man/amoverview.8 +++ b/man/amoverview.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amoverview .\" Author: Stefan G. Weichinger -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMOVERVIEW" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMOVERVIEW" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amoverview \- display file systems processed by \fIAmanda\fR over time -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamoverview\fR\ 'u \fBamoverview\fR [[\-config\ ]\ \fIconfig\fR] [\-hostwidth\ \fIwidth\fR] [\-diskwidth\ \fIwidth\fR] [\-skipmissed] [\-last] [\-num0] [\-togo0] [\-verbose] -.fam .SH "DESCRIPTION" .PP \fBAmoverview\fR @@ -257,7 +107,7 @@ failed to write to tape the first time because it hit end of tape (resulting in .SH "EXAMPLE" .PP This shows the -\FC/home\F[] +/home file system on \fIhost2\fR was backed up at level 3 on the 8th, 9th and 10th of December, had a full backup on the 11th, a level 1 on the 12th and a level 2 on the 13th\&. @@ -278,6 +128,6 @@ host2 /var 1 1 0 1 1 1 \fBamadmin\fR(8), \fBamanda\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBStefan G\&. Weichinger\fR <\&sgw@amanda\&.org\&> diff --git a/man/amplot.8 b/man/amplot.8 index 54f8434..90ad3f1 100644 --- a/man/amplot.8 +++ b/man/amplot.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amplot .\" Author: Olafur Gudmundsson -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMPLOT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMPLOT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,15 +18,13 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amplot \- visualize the behavior of \fIAmanda\fR -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamplot\fR\ 'u \fBamplot\fR [\-b] [\-c] [\-e] [\-g] [\-l] [\-p] [\-t\ \fIT\fR] \fIamdump_files\fR .br -.fam .SH "DESCRIPTION" .PP \fBAmplot\fR @@ -310,7 +160,7 @@ Reports lines it does not recognize, mainly error cases but some are legitimate \fBcompress\fR(1), \fBgzip\fR(1), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBOlafur Gudmundsson\fR <\&ogud@tis\&.com\&> .RS 4 diff --git a/man/amrecover.8 b/man/amrecover.8 index 4a11392..a13cd95 100644 --- a/man/amrecover.8 +++ b/man/amrecover.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amrecover .\" Author: Alan M. McIvor -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMRECOVER" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMRECOVER" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amrecover \- \fIAmanda\fR index database browser -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamrecover\fR\ 'u \fBamrecover\fR [\-C\ \fIconfig\fR] [\-s\ \fIindex\-server\fR] [\-t\ \fItape\-server\fR] [\-d\ \fItape\-device\fR] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmrecover\fR @@ -202,7 +52,6 @@ man page for more details about .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -216,7 +65,6 @@ The Default values are those set at compile\-time\&. Use \fBamrestore\fR to recover client\-encrypted or client\-custom\-compressed tapes\&. .sp .5v -.EM yellow .RE .PP \fB[ \-C ] config\fR @@ -269,25 +117,11 @@ For example, if: .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - 1996\-07\-01 was a level 0 backup 1996\-07\-02 through 1996\-07\-05 were level 1 backups 1996\-07\-06 through 1997\-07\-08 were level 2 backups -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -299,25 +133,11 @@ would yield files from the following days: .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - 1997\-07\-08 (the latest level 2 backup) 1997\-07\-05 (the latest level 1 backup) 1997\-07\-01 (the latest level 0 backup) -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -670,7 +490,7 @@ If set, $AMANDA_TAPE_SERVER will be used as tape\-server\&. The value will take \fBamfetchdump\fR(8), \fBreadline\fR(3), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBAlan M\&. McIvor\fR <\&alan@kauri\&.auck\&.irl\&.cri\&.nz\&> .PP diff --git a/man/amreport.8 b/man/amreport.8 index d994828..572a598 100644 --- a/man/amreport.8 +++ b/man/amreport.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amreport .\" Author: Stefan G. Weichinger -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMREPORT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMREPORT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amreport \- generate a formatted output of statistics for an \fIAmanda\fR run -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamreport\fR\ 'u \fBamreport\fR [\fIconfig\fR] [\-i] [\-M\ \fIaddress\fR] [\-l\ \fIlogfile\fR] [\-f\ \fIoutputfile\fR] [\-p\ \fIpostscriptfile\fR] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmreport\fR @@ -269,26 +119,12 @@ provides label templates for the following tape types\&. These are pretty generi .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - * ExaByte 8mm tapes * DAT 4mm tapes * DLT tapes * 3\-ring binder -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -310,6 +146,6 @@ The exit code of \fBamreport\fR is the ORed value of: \fBamanda\fR(8), \fBamflush\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBStefan G\&. Weichinger\fR <\&sgw@amanda\&.org\&> diff --git a/man/amrestore.8 b/man/amrestore.8 index 64615a0..545eba1 100644 --- a/man/amrestore.8 +++ b/man/amrestore.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amrestore .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMRESTORE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMRESTORE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amrestore \- extract backup images from an \fIAmanda\fR tape -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamrestore\fR\ 'u \fBamrestore\fR [\-r | \-c | \-C] [\-b | \fIblocksize\fR] [\-f | \fIfileno\fR] [\-l | \fIlabel\fR] [\-p] [\-h] \fItapedevice\fR|\ \fIholdingfile\fR [\fIhostname\fR [\fIdiskname\fR [\fIdatestamp\fR [\fIhostname\fR [\fIdiskname\fR [\fIdatestamp\fR | \&.\&.\&.]]]]]] -.fam .SH "DESCRIPTION" .PP \fBAmrestore\fR @@ -348,23 +198,9 @@ option to .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - % amrestore \-p /dev/nrmt9 seine rz3g | restore \-ivbf 2 \- -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -375,29 +211,15 @@ The next example extracts all backup images for host .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - % amrestore /dev/nrmt9 seine -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} .PP If the backup datestamp in the above example is -\FC19910125\F[] +19910125 and \fIseine\fR has level 0 backups of disks @@ -409,24 +231,10 @@ on the tape, these files will be created in the current directory: .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - seine\&.rz1a\&.19910125\&.0 seine\&.rz1g\&.19910125\&.0 -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -438,23 +246,9 @@ to extract a backup image from a holding disk file that has not yet been flushed .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - % amrestore \-p /amanda/20001119/seine\&.rz1a\&.2 | restore \-ivbf 2 \- -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -465,24 +259,10 @@ may be used to generate a listing of images on a tape: .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - % mt \-f /dev/nrmt9 rewind % amrestore \-p /dev/nrmt9 no\-such\-host > /dev/null -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -503,7 +283,7 @@ must be used to restore files from backup images created with the GNUTAR dumptyp \fBtar\fR(1), \fBrestore\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amrmtape.8 b/man/amrmtape.8 index b97ce1e..f547964 100644 --- a/man/amrmtape.8 +++ b/man/amrmtape.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amrmtape .\" Author: Adrian T. Filipi-Martin -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMRMTAPE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMRMTAPE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amrmtape \- remove a tape from the \fIAmanda\fR database -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamrmtape\fR\ 'u \fBamrmtape\fR [\-n] [\-v] [\-q] [\-d] \fIconfig\fR \fIlabel\fR -.fam .SH "DESCRIPTION" .PP \fBAmrmtape\fR @@ -191,7 +41,7 @@ Generate new and database files with \fIlabel\fR removed, but leave them in -\FC/tmp\F[] +/tmp and do not update the original copies\&. .RE .PP @@ -225,7 +75,7 @@ configuration\&. \fBamadmin\fR(8), \fBamanda\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBAdrian T\&. Filipi\-Martin\fR <\&atf3r@cs\&.virginia\&.edu\&> .PP diff --git a/man/amsamba.8 b/man/amsamba.8 index c6e0f4a..50d43bb 100644 --- a/man/amsamba.8 +++ b/man/amsamba.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amsamba .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMSAMBA" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMSAMBA" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amsamba \- Amanda Application to interface with smbclient .SH "DESCRIPTION" .PP @@ -221,9 +73,9 @@ Domain is optional\&. Example: \fBamanda.conf\fR(5), \fBamanda-applications\fR(7) -.SH "Author" +.SH "AUTHOR" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amserverconfig.8 b/man/amserverconfig.8 index 2838d19..b554d99 100644 --- a/man/amserverconfig.8 +++ b/man/amserverconfig.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amserverconfig .\" Author: Kevin Till -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMSERVERCONFIG" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMSERVERCONFIG" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amserverconfig \- program to setup initial \fIAmanda\fR configuration -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamserverconfig\fR\ 'u \fBamserverconfig\fR \fIconfig\fR [\-\-template\ \fItemplate\fR] [\-\-no\-vtape] [\-\-tapetype\ \fItapetype\fR] [\-\-tpchanger\ \fItpchanger\fR] [\-\-tapedev\ \fItapedev\fR] [\-\-changerfile\ \fIchangerfile\fR] [\-\-changerdev\ \fIchangerdev\fR] [\-\-labelstr\ \fIlabelstr\fR] [\-\-mailto\ \fImailto\fR] [\-\-dumpcycle\ \fIdumpcycle\fR] [\-\-runspercycle\ \fIrunspercycle\fR] [\-\-runtapes\ \fIruntapes\fR] [\-\-tapecycle\ \fItapecycle\fR] [\-\-help] -.fam .SH "DESCRIPTION" .PP After Amanda rpms are successfully installed, @@ -186,7 +36,7 @@ does not change existing configurations\&. \fBamserverconfig\fR must be run by user amandabackup\&. -.SH "Options" +.SH "OPTIONS" .PP Options may be abbreviated, as long as the abbreviation is not ambiguous\&. Option argument can either separated by \'=\' or a space\&. Example: \-\-templ=harddisk \-\-tapedev /dev/nst0 .PP @@ -283,7 +133,7 @@ The size of tape rotation\&. default [25] .RS 4 Display usage\&. .RE -.SH "Files" +.SH "FILES" .PP \fB/var/lib/amanda/template\&.d\fR .RS 4 @@ -334,9 +184,9 @@ On success, zero is returned\&. On error, 1 is returned\&. \fBamanda.conf\fR(5), \fBamaddclient\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBKevin Till\fR <\&kevin\&.till@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amservice.8 b/man/amservice.8 index 6278247..cd8c3fd 100644 --- a/man/amservice.8 +++ b/man/amservice.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amservice .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMSERVICE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMSERVICE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amservice \- run an amanda service on a client -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamservice\fR\ 'u \fBamservice\fR \fIhostname\fR \fIauth\fR \fIservice\fR [\-f\ \fIinput_file\fR] [\-o\ \fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmservice\fR @@ -239,9 +89,9 @@ can exit with value 0 even if the user is not authorized to execute the service\ \fBamcheck\fR(8), \fBamdump\fR(8), \fBamadmin\fR(8) -.SH "Author" +.SH "AUTHOR" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amstar.8 b/man/amstar.8 index c5830ce..afafa95 100644 --- a/man/amstar.8 +++ b/man/amstar.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amstar .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMSTAR" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMSTAR" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amstar \- Amanda Application to interface with star .SH "DESCRIPTION" .PP @@ -213,14 +65,14 @@ The directory where star stores the database it uses to generate incremental dum \fBamanda.conf\fR(5), \fBamanda-applications\fR(7) -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amstatus.8 b/man/amstatus.8 index 092c9a0..a118c26 100644 --- a/man/amstatus.8 +++ b/man/amstatus.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amstatus .\" Author: Stefan G. Weichinger -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMSTATUS" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMSTATUS" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amstatus \- display the state of an \fIAmanda\fR run -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamstatus\fR\ 'u \fBamstatus\fR [\-\-config] \fIconfig\fR [\-\-file\ \fIamdumpfile\fR] [\-\-summary] [\-\-dumping] [\-\-waitdumping] [\-\-waittaper] [\-\-dumpingtape] [\-\-writingtape] [\-\-finished] [\-\-failed] [\-\-estimate] [\-\-gestimate] [\-\-stats] [\-\-locale\-independent\-date\-format] -.fam .SH "DESCRIPTION" .PP \fBAmstatus\fR @@ -285,6 +135,6 @@ The exit code of \fBamstatus\fR is the ORed value of: \fBamrestore\fR(8), \fBamadmin\fR(8), : http://wiki.zmanda.com -.SH "Author" +.SH "AUTHOR" .PP \fBStefan G\&. Weichinger\fR <\&sgw@amanda\&.org\&> diff --git a/man/amtape.8 b/man/amtape.8 index e0c6ae1..0f91a76 100644 --- a/man/amtape.8 +++ b/man/amtape.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amtape .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMTAPE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMTAPE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amtape \- user interface to \fIAmanda\fR tape changer controls -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamtape\fR\ 'u \fBamtape\fR \fIconfig\fR \fIcommand\fR [\fIcommand_options\fR...] [\fB\-o\ \fR\fIconfigoption\fR]... -.fam .SH "DESCRIPTION" .PP \fBAmtape\fR @@ -306,7 +156,7 @@ commands to not eject the loaded tape if it is the one being requested\&. .PP \fBamanda\fR(8), : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP diff --git a/man/amtapetype.8 b/man/amtapetype.8 index 1632f6d..edb1b40 100644 --- a/man/amtapetype.8 +++ b/man/amtapetype.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amtapetype .\" Author: Dustin J. Mitchell -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMTAPETYPE" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMTAPETYPE" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amtapetype \- generate a tapetype definition by testing the device directly -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamtapetype\fR\ 'u \fBamtapetype\fR [\-h] [\-c] [\-f] [\-b\ \fIblocksize\fR] [\-t\ \fItypename\fR] [\-l\ \fIlabel\fR] [\-o\ \fIconfig_overwrite\fR] [\fIdevice\fR] -.fam .SH "DESCRIPTION" .PP \fBamtapetype\fR @@ -184,7 +34,6 @@ by testing the device directly .sp .\} .RS 4 -.BM yellow .it 1 an-trap .nr an-no-space-flag 1 .nr an-break-flag 1 @@ -198,7 +47,6 @@ The options for \fBamtapetype\fR have changed in version 2\&.6\&.1 .sp .5v -.EM yellow .RE .PP \fB\-h\fR @@ -243,23 +91,9 @@ Generate a tapetype definition for your tape device: .if n \{\ .RS 4 .\} -.fam C -.ps -1 .nf -.if t \{\ -.sp -1 -.\} -.BB lightgray adjust-for-leading-newline -.sp -1 - % amtapetype \-f /dev/nst0 -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 -.\} .fi -.fam -.ps +1 .if n \{\ .RE .\} @@ -276,14 +110,14 @@ All sorts of things might happen to cause the amount of data written to vary eno Note that the file mark size might really be zero for whatever device this is, and it was just the measured capacity variation that caused \fBamtapetype\fR to think those extra file marks in pass 2 actually took up space\&. -.SH "Authors" +.SH "AUTHORS" .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amtoc.8 b/man/amtoc.8 index 65c997a..56a7ba7 100644 --- a/man/amtoc.8 +++ b/man/amtoc.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amtoc .\" Author: Nicolas Mayencourt -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMTOC" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMTOC" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amtoc \- generate TOC (Table Of Contents) for an \fIAmanda\fR run -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamtoc\fR\ 'u \fBamtoc\fR [\-a] [\-i] [\-t] [\-f\ \fIfile\fR] [\-s\ \fIsubs\fR] [\-w] [\-\-] \fIlogfile\fR -.fam .SH "DESCRIPTION" .PP \fIAmtoc\fR @@ -276,7 +126,7 @@ after an \fBamflush\fR(8), \fBamgetconf\fR(8), cron, perl, : http://wiki.zmanda.com -.SH "Authors" +.SH "AUTHORS" .PP \fBNicolas Mayencourt\fR <\&Nicolas\&.Mayencourt@cui\&.unige\&.ch\&> .RS 4 diff --git a/man/amvault.8 b/man/amvault.8 index 5b36e39..682928f 100644 --- a/man/amvault.8 +++ b/man/amvault.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amvault .\" Author: Dustin J. Mitchell -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMVAULT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMVAULT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,13 +18,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amvault \- Copy \fIAmanda\fR dumps from one volume to another -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBamvault\fR\ 'u \fBamvault\fR [\-o\ \fIconfigoption\fR]... \fIconfig\fR \fIsrc\-run\-timestamp\fR \fIdst\-changer\fR \fIlabel\-template\fR -.fam .SH "WARNING" .PP This application is not yet in its final form, and is subject to major revision in subsequent versions of Amanda\&. Backward compatibility is not guaranteed\&. @@ -214,9 +64,9 @@ parameter in .SH "SEE ALSO" .PP \fBamanda\fR(8) -.SH "Author" +.SH "AUTHOR" .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amzfs-sendrecv.8 b/man/amzfs-sendrecv.8 index e0d6168..6482760 100644 --- a/man/amzfs-sendrecv.8 +++ b/man/amzfs-sendrecv.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amzfs-sendrecv .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMZFS\-SENDRECV" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMZFS\-SENDRECV" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amzfs-sendrecv \- Amanda script to create zfs sendrecv .SH "DESCRIPTION" .PP @@ -260,9 +112,9 @@ In this example, a dumptype is defined to use amzfs\-sendrecv application to bac \fBamanda.conf\fR(5), \fBamanda-client.conf\fR(5), \fBamanda-applications\fR(7) -.SH "Author" +.SH "AUTHOR" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/amzfs-snapshot.8 b/man/amzfs-snapshot.8 index ab76f1e..7ef2d78 100644 --- a/man/amzfs-snapshot.8 +++ b/man/amzfs-snapshot.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: amzfs-snapshot .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "AMZFS\-SNAPSHOT" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "AMZFS\-SNAPSHOT" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" amzfs-snapshot \- Amanda script to create zfs snapshot .SH "DESCRIPTION" .PP @@ -265,14 +117,14 @@ In this example, a dumptype is defined to use amzfs\-snapshot script to create a \fBamanda.conf\fR(5), \fBamanda-client.conf\fR(5), \fBamanda-scripts\fR(7) -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/disklist.5 b/man/disklist.5 index bd1b95f..59f8e0b 100644 --- a/man/disklist.5 +++ b/man/disklist.5 @@ -1,161 +1,13 @@ +'\" t .\" Title: disklist .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: File formats and conventions -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "DISKLIST" "5" "01/22/2009" "Amanda 2\&.6\&.1" "File formats and conventions" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "DISKLIST" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" disklist \- List of partitions to back up for \fIAmanda\fR .SH "DESCRIPTION" .PP @@ -216,13 +68,13 @@ command\&. Look at the example/disklist file for example\&. \fIdiskdevice\fR .RS 4 Default: same as diskname\&. The name of the disk device to be backed up\&. It may be a full device name, a device name without the -\FC/dev/\F[] +/dev/ prefix, e\&.g\&. \fIsd0a\fR, or a mount point such as -\FC/usr\F[]\&. +/usr\&. .sp It may also refer to a PC share by starting the name with two (forward) slashes, e\&.g\&. -\FC//some\-pc/home\F[]\&. In this case, the +//some\-pc/home\&. In this case, the \fBprogram\fR option in the associated \fBdumptype\fR @@ -242,7 +94,7 @@ defined in the \fBamanda\&.conf\fR file\&. \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in -\FC/etc/dumpdates\F[], the disk\'s relative priority, etc\&. +/etc/dumpdates, the disk\'s relative priority, etc\&. .RE .PP \fIspindle\fR @@ -286,7 +138,7 @@ is used for most disks, but use of the holding disk needs to be disabled for the holdingdisk never } [ \fIspindle\fR [ \fIinterface\fR ] ] .fi -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP @@ -294,5 +146,5 @@ is used for most disks, but use of the holding disk needs to be disabled for the .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/script-email.8 b/man/script-email.8 index d548a56..1c0b2b2 100644 --- a/man/script-email.8 +++ b/man/script-email.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: script-email .\" Author: Jean-Louis Martineau -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: System Administration Commands -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "SCRIPT\-EMAIL" "8" "01/22/2009" "Amanda 2\&.6\&.1" "System Administration Commands" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "SCRIPT\-EMAIL" "8" "04/10/2009" "Amanda 2\&.6\&.1p1" "System Administration Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" script-email \- Amanda script to send email notifications .SH "DESCRIPTION" .PP @@ -214,14 +66,14 @@ dumptype, which can then be specified for any DLEs which require notification\&. \fBamanda.conf\fR(5), \fBamanda-client.conf\fR(5), \fBamanda-scripts\fR(7) -.SH "Authors" +.SH "AUTHORS" .PP \fBJean\-Louis Martineau\fR <\&martineau@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/tapelist.5 b/man/tapelist.5 index 5d2ffb3..e94d9fa 100644 --- a/man/tapelist.5 +++ b/man/tapelist.5 @@ -1,161 +1,13 @@ +'\" t .\" Title: tapelist .\" Author: James da Silva -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 01/22/2009 +.\" Generator: DocBook XSL Stylesheets vsnapshot_8273 +.\" Date: 04/10/2009 .\" Manual: File formats and conventions -.\" Source: Amanda 2.6.1 +.\" Source: Amanda 2.6.1p1 .\" Language: English .\" -.TH "TAPELIST" "5" "01/22/2009" "Amanda 2\&.6\&.1" "File formats and conventions" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.TH "TAPELIST" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,7 +18,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" tapelist \- The list of \fIAmanda\fR volumes in use .SH "DESCRIPTION" .PP @@ -204,7 +56,7 @@ will by default refuse to write to an unlabeled tape, or to a labeled tape that option) than there are runs in the backup cycle (see the \fBdumpcycle\fR option) to prevent overwriting a backup image that would be needed to do a full recovery\&. -.SH "Authors" +.SH "AUTHORS" .PP \fBJames da Silva\fR <\&jds@amanda\&.org\&> .PP @@ -212,5 +64,5 @@ option) to prevent overwriting a backup image that would be needed to do a full .PP \fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> .RS 4 -Zmanda, Inc\&. (\FChttp://www\&.zmanda\&.com\F[]) +Zmanda, Inc\&. (http://www\&.zmanda\&.com) .RE diff --git a/man/xml-source/amanda.conf.5.xml b/man/xml-source/amanda.conf.5.xml index 79a7f05..ed84492 100644 --- a/man/xml-source/amanda.conf.5.xml +++ b/man/xml-source/amanda.conf.5.xml @@ -2107,16 +2107,13 @@ convert it to kbytes using the device density. length int Default: -2000 kbytes. How much data will fit on a tape. +2000 kbytes. How much data will fit on a tape, expressed in kbytes. Note that this value is only used by &A; to schedule which backups will be run. Once the backups start, &A; will continue to write to a tape until it gets an error, regardless of what value is entered for length -(but see the section OUTPUT DRIVERS in the -amanda8 -manpage for exceptions). +(but see amanda-devices7 for exceptions). -The default unit is bytes if it is not specified. @@ -2125,9 +2122,7 @@ manpage for exceptions). Default: 32 kbytes. -How much data will be written in each tape record. This is equivalent to the BLOCK_SIZE device property. - -The default unit is Kbytes if it is not specified. +How much data will be written in each tape record, expressed in kbytes. This is similar to the BLOCK_SIZE device property, but if the blocksize is not a multiple of 1024 bytes, then this parameter cannot be used to specify it, and the property must be used instead. @@ -2527,10 +2522,6 @@ define changer name { device. The remaining parameters are specific to the changer type selected. - -TODO: more detail here once it's known - - SEE ALSO diff --git a/oldrecover-src/set_commands.c b/oldrecover-src/set_commands.c index a0c83ba..d3712df 100644 --- a/oldrecover-src/set_commands.c +++ b/oldrecover-src/set_commands.c @@ -391,7 +391,7 @@ cd_dir( if(dir[strlen(dir)-1] == '/') dir[strlen(dir)-1] = '\0'; /* remove last / */ /* remove everything before the last / */ - dir1 = rindex(dir,'/'); + dir1 = strrchr(dir,'/'); if (dir1) { dir1++; dir2 = stralloc(dir1); diff --git a/packaging/deb/buildpkg b/packaging/deb/buildpkg index c054e32..c36e554 100755 --- a/packaging/deb/buildpkg +++ b/packaging/deb/buildpkg @@ -49,7 +49,7 @@ fi if [ -z $AMVER ] then - AMVER=amanda-2.6.1 + AMVER=amanda-2.6.1p1 fi if [ -z $AMTARBALL ] diff --git a/packaging/deb/changelog b/packaging/deb/changelog index 306d3dc..069bb96 100644 --- a/packaging/deb/changelog +++ b/packaging/deb/changelog @@ -1,4 +1,4 @@ -amanda (2.6.1-1) unstable; urgency=low +amanda (2.6.1p1-1) unstable; urgency=low * Initial debian release: This package is based on Bdale Garbee's work as the official debian maintainer for amanda. diff --git a/packaging/deb/rules b/packaging/deb/rules index 6fcae65..f92d2b9 100755 --- a/packaging/deb/rules +++ b/packaging/deb/rules @@ -8,7 +8,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -AMVER=2.6.1 +AMVER=2.6.1p1 # These are variables that the user can override. They get used in various # places during configure, build, and install. diff --git a/packaging/rpm/amanda.spec b/packaging/rpm/amanda.spec index acb6d23..ac30f05 100644 --- a/packaging/rpm/amanda.spec +++ b/packaging/rpm/amanda.spec @@ -41,32 +41,40 @@ %define dist fedora %define disttag fc %define distver 3 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "Fedora" && $4 ~ /4.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist fedora %define disttag fc %define distver 4 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "Fedora" && $4 ~ /5.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist fedora %define disttag fc %define distver 5 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "Fedora" && $4 ~ /6.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist fedora %define disttag fc %define distver 6 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "Fedora" && $3 ~ /7.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist fedora %define disttag fc %define distver 7 + %define requires_libtermcap Requires: libtermcap.so.2 %endif # if macro cannot have an empty test and we're just testing the existance %if %{?fedora:yes}%{!?fedora:no} == yes %define dist fedora %define disttag fc %define distver %{fedora} + %if %{distver} <= 8 + %define requires_libtermcap Requires: libtermcap.so.2 + %endif %if %{_host_cpu} == x86_64 && %{_target_cpu} == i686 # Do nothing if PKG_CONFIG_PATH was set by the user above. %{!?PKG_CONFIG_PATH: %define PKG_CONFIG_PATH /usr/lib/pkgconfig} @@ -77,71 +85,51 @@ %define disttag rhel %define distver 3 %define tarver 1.14 + %define requires_libtermcap Requires: libtermcap.so.2 + %define without_ipv6 --without-ipv6 %endif %if %(awk '$1 == "Red" && $7 ~ /4.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist redhat %define disttag rhel %define distver 4 %define tarver 1.14 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "CentOS" && $3 ~ /4.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist redhat %define disttag rhel %define distver 4 %define tarver 1.14 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "Red" && $7 ~ /5.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist redhat %define disttag rhel %define distver 5 + %define requires_libtermcap Requires: libtermcap.so.2 %endif %if %(awk '$1 == "CentOS" && $3 ~ /5.*/ { exit 1; }' /etc/redhat-release; echo $?) %define dist redhat %define disttag rhel %define distver 5 + %define requires_libtermcap Requires: libtermcap.so.2 %endif # If dist is undefined, we didn't detect. %{!?dist:%define dist unknown} %endif -# Detect Suse variants. Suse gives us some nice macros in their rpms +# Detect Suse variants. %if %{_vendor} == "suse" %define dist SuSE - %if %{sles_version} == 0 - %define disttag suse - %if %{suse_version} == 910 - %define distver 9 - %endif - %if %{suse_version} == 1000 - %define distver 10 - %endif - %if %{suse_version} == 1010 - %define distver 10 - %endif - # Written against SLES11-beta2, which is using SUSE11's rpm system. - # This will change when they release, I assume. - %if %{suse_version} == 1100 - # assume it's sles11 in disguise, for now - %define disttag sles - %define distver 11 - %endif - %if %{suse_version} == 1110 - %define distver 11.1 - %endif - %else - %define disttag sles - # sles versions are simple integers, just like we want - %define distver %{sles_version} - %endif - - # If dist is undefined, we didn't detect. - %{!?dist:%define dist unknown} + %define disttag %(awk '$1=="SUSE" {$3=="Enterprise" ? TAG="sles" : TAG="suse" ; print TAG}' /etc/SuSE-release) + %define distver %(awk '$1=="SUSE" {$3=="Enterprise" ? VER=$5 : VER=$3 ; print VER}' /etc/SuSE-release) %endif # Set options per distribution %if %{dist} == redhat || %{dist} == fedora %define rpm_group Applications/Archiving %define xinetd_reload restart + %define requires_initscripts Requires: initscripts %endif %if %{dist} == SuSE %define rpm_group Productivity/Archiving/Backup @@ -159,7 +147,7 @@ # --- Definitions --- # Define amanda_version if it is not already defined. -%{!?amanda_version: %define amanda_version 2.6.1} +%{!?amanda_version: %define amanda_version 2.6.1p1} %{!?amanda_release: %define amanda_release 1} %define amanda_version_info "Amanda Community Edition - version %{amanda_version}" %define amanda_user amandabackup @@ -190,6 +178,8 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gcc BuildRequires: glibc >= 2.2.0 +# Note: newer distros have changed most *-devel to lib*-devel, and added a +# provides tag for backwards compat. BuildRequires: readline BuildRequires: readline-devel BuildRequires: curl >= 7.10.0 @@ -216,12 +206,8 @@ Requires: xinetd Requires: perl >= 5.6.0 Requires: tar >= %{tarver} Requires: readline -%if %{dist} == redhat || %{dist} == fedora - %if %{distver} <= 8 -Requires: libtermcap.so.2 - %endif -Requires: initscripts -%endif +%{?requires_libtermcap} +%{?requires_initscripts} Provides: amanda-backup_client = %{amanda_version}, amanda-backup_server = %{amanda_version} %package backup_client @@ -230,12 +216,8 @@ Group: %{rpm_group} Requires: /bin/awk Requires: fileutils Requires: grep -%if %{dist} == redhat || %{dist}== fedora - %if %{distver} <= 8 -Requires: libtermcap.so.2 - %endif -Requires: initscripts -%endif +%{?requires_libtermcap} +%{?requires_initscripts} Requires: xinetd Requires: libc.so.6 Requires: libm.so.6 @@ -257,12 +239,8 @@ Requires: grep Requires: libc.so.6 Requires: libm.so.6 Requires: libnsl.so.1 -%if %{dist} == redhat || %{dist}== fedora - %if %{distver} <= 8 -Requires: libtermcap.so.2 - %endif -Requires: initscripts -%endif +%{?requires_libtermcap} +%{?requires_initscripts} Requires: xinetd Requires: perl >= 5.6.0 Requires: tar >= %{tarver} @@ -360,39 +338,9 @@ Amanda Documentation is available at: http://wiki.zmanda.com/ %define config_user %{amanda_user} %define config_group %{amanda_group} -%if %{disttag} == rhel && %{distver} == 3 -./configure \ - CFLAGS="%{optflags} -g" CXXFLAGS="%{optflags}" \ - --quiet \ - --prefix=%{PREFIX} \ - --sysconfdir=%{SYSCONFDIR} \ - --sharedstatedir=%{LOCALSTATEDIR} \ - --localstatedir=%{LOCALSTATEDIR} \ - --libdir=%{LIBDIR} \ - --includedir=%{INCLUDEDIR} \ - --with-amdatadir=%{AMDATADIR} \ - --with-gnuplot=/usr/bin/gnuplot \ - --with-gnutar-listdir=%{AMANDAHOMEDIR}/gnutar-lists \ - --with-index-server=localhost \ - --with-tape-server=localhost \ - --with-user=%{config_user} \ - --with-group=%{config_group} \ - --with-owner=%{packer} \ - --with-fqdn \ - --with-bsd-security \ - --with-bsdtcp-security \ - --with-bsdudp-security \ - --with-ssh-security \ - --with-udpportrange=%{udpportrange} \ - --with-tcpportrange=%{tcpportrange} \ - --with-low-tcpportrange=%{low_tcpportrange} \ - --with-debugging=%{LOGDIR} \ - --with-assertions \ - --disable-installperms \ - --without-ipv6 -%else -# This confusing macro results in PKG_CONFIG_PATH=some/path if some/path -# was set on the command line, or by the platform detection bits. +# Set PKG_CONFIG_PATH=some/path if some/path was set on the command line, or by +# the platform detection bits. +# without_ipv6 should only be defined on rhel3. ./configure \ %{?PKG_CONFIG_PATH: PKG_CONFIG_PATH=%PKG_CONFIG_PATH} \ CFLAGS="%{optflags} -g" CXXFLAGS="%{optflags}" \ @@ -404,7 +352,6 @@ Amanda Documentation is available at: http://wiki.zmanda.com/ --libdir=%{LIBDIR} \ --includedir=%{INCLUDEDIR} \ --with-amdatadir=%{AMDATADIR} \ - --with-star=/usr/bin/star \ --with-gnuplot=/usr/bin/gnuplot \ --with-gnutar=/bin/tar \ --with-gnutar-listdir=%{AMANDAHOMEDIR}/gnutar-lists \ @@ -423,8 +370,8 @@ Amanda Documentation is available at: http://wiki.zmanda.com/ --with-low-tcpportrange=%{low_tcpportrange} \ --with-debugging=%{LOGDIR} \ --with-assertions \ - --disable-installperms -%endif + --disable-installperms \ + %{?without_ipv6} make diff --git a/packaging/rpm/buildpkg b/packaging/rpm/buildpkg index d2b3934..450822d 100755 --- a/packaging/rpm/buildpkg +++ b/packaging/rpm/buildpkg @@ -27,7 +27,7 @@ set -x # Buildbot exports some useful env variables. # Check for $AMVER. I couldn't come up with a good way to detect it. if [ -z $AMVER ]; then - AMVER=amanda-2.6.1 + AMVER=amanda-2.6.1p1 fi # Check for AMTARBALL variable. diff --git a/perl/Amanda/Changer.pm b/perl/Amanda/Changer.pm index a012650..ea664f9 100644 --- a/perl/Amanda/Changer.pm +++ b/perl/Amanda/Changer.pm @@ -187,6 +187,13 @@ an amtape argument). Note that some changers cannot detect the completion of a cleaning cycle; in this case, the user will just need to delay further Amanda activities until the cleaning is complete. +=head3 $chg->eject(finished_cb => $cb, drive => $drivename) + +Eject the volume in a drive, if the changer supports it. Drivename is as +specified to C. If possible, applications should prefer to eject a +reserved volume when finished with it (C<< $res->release(eject => 1) >>), to +ensure that the correct volume is ejected from a multi-drive changer. + =head3 $chg->update(finished_cb => $cb, changed => $changed) The user has changed something -- loading or unloading tapes, @@ -493,6 +500,16 @@ sub clean { } } +sub eject { + my $self = shift; + my %params = @_; + + my $class = ref($self); + if (exists $params{'finished_cb'}) { + $params{'finished_cb'}->("$class does not support eject()"); + } +} + sub update { my $self = shift; my %params = @_; @@ -575,14 +592,17 @@ sub release { $self->{'released'} = 1; $self->do_release(%params); - - if (exists $params{'finished_cb'}) { - Amanda::MainLoop::call_later($params{'finished_cb'}, undef); - } } sub do_release { + my $self = shift; + my %params = @_; + # this is the one subclasses should override + + if (exists $params{'finished_cb'}) { + Amanda::MainLoop::call_later($params{'finished_cb'}, undef); + } } 1; diff --git a/perl/Amanda/Changer/compat.pm b/perl/Amanda/Changer/compat.pm index 3a96935..4b0028b 100644 --- a/perl/Amanda/Changer/compat.pm +++ b/perl/Amanda/Changer/compat.pm @@ -29,7 +29,7 @@ use File::Path; use Amanda::Paths; use Amanda::MainLoop qw( :GIOCondition ); use Amanda::Config qw( :getconf ); -use Amanda::Debug; +use Amanda::Debug qw( debug ); use Amanda::Device qw( :constants ); use Amanda::Changer; @@ -131,44 +131,53 @@ sub _manual_scan { my $self = shift; my %params = @_; my $nchecked = 0; - my $check_slot; + my ($run_success_cb, $run_fail_cb, $load_next); - # search manually, starting with "current". This is complicated, because - # it's an event-based loop. + # search manually, starting with "current" and proceeding through nslots-1 + # loads of "next" # TODO: support the case where nslots == -1 - $check_slot = sub { - my ($err, $res) = @_; - - TRYSLOT: { - # ignore "benign" errors - next TRYSLOT if $err; - - my $device = Amanda::Device->new($res->{'device_name'}); - next TRYSLOT unless $device; - next TRYSLOT if ($device->read_label() != $DEVICE_STATUS_SUCCESS); - next TRYSLOT unless ($device->volume_label() eq $params{'label'}); + $run_success_cb = sub { + my ($slot, $rest) = @_; + my $device = Amanda::Device->new($rest); + if ($device and $device->configure(1) + and $device->read_label() == $DEVICE_STATUS_SUCCESS + and $device->volume_label() eq $params{'label'}) { # we found the correct slot + my $res = Amanda::Changer::compat::Reservation->new($self, $slot, $rest); Amanda::MainLoop::call_later($params{'res_cb'}, undef, $res); return; } - # on to the next slot + $load_next->(); + }; + + $run_fail_cb = sub { + my ($exitval, $message) = @_; + + # don't continue scanning after a fatal error + if ($exitval > 1) { + Amanda::MainLoop::call_later($params{'res_cb'}, $message, undef); + return; + } + + $load_next->(); + }; + + $load_next = sub { + # if we've scanned all nslots, we haven't found the label. if (++$nchecked >= $self->{'nslots'}) { Amanda::MainLoop::call_later($params{'res_cb'}, "Volume '$params{label}' not found", undef); return; - } else { - # loop again with the next slot - $res->release(); # we know this completes immediately - $self->load(slot => "next", res_cb => $check_slot); - } + } + + $self->_run_tpchanger($run_success_cb, $run_fail_cb, "-slot", "next"); }; - # kick off the loop with the current slot - $self->load(slot => "current", res_cb => $check_slot); + $self->_run_tpchanger($run_success_cb, $run_fail_cb, "-slot", "current"); } sub info { @@ -211,13 +220,16 @@ sub _simple_op { my $op = shift; my %params = @_; + Amanda::Debug::debug("running simple op '$op'"); my $run_success_cb = sub { + Amanda::Debug::debug("simple op '$op' ok"); if (exists $params{'finished_cb'}) { $params{'finished_cb'}->(undef); } }; my $run_fail_cb = sub { my ($exitval, $message) = @_; + Amanda::Debug::debug("simple op '$op' failed: $message"); if (exists $params{'finished_cb'}) { $params{'finished_cb'}->($message); } @@ -240,6 +252,14 @@ sub clean { $self->_simple_op("clean", %params); } +sub eject { + my $self = shift; + my %params = @_; + + # note: parameter 'drive' is ignored + $self->_simple_op("eject", %params); +} + sub update { my $self = shift; my %params = @_; @@ -413,8 +433,13 @@ sub _run_tpchanger { # everything is finished -- process the results and invoke the callback chomp $child_output; - # handle fatal errors - if (!POSIX::WIFEXITED($child_exit_status) || POSIX::WEXITSTATUS($child_exit_status) > 1) { + # mark this object as no longer busy. This frees the + # object up to begin the next operation, which may happen + # during the invocation of the callback + $self->{'busy'} = 0; + + # handle unexpected exit status as a fatal error + if (!POSIX::WIFEXITED($child_exit_status) || POSIX::WEXITSTATUS($child_exit_status) > 2) { $failure_cb->(POSIX::WEXITSTATUS($child_exit_status), "Fatal error from changer script: ".$child_output); return; @@ -422,19 +447,20 @@ sub _run_tpchanger { # parse the child's output my @child_output = split '\n', $child_output; - $failure_cb->(2, "Malformed output from changer script -- no output") - if (@child_output < 1); - $failure_cb->(2, "Malformed output from changer script -- too many lines") - if (@child_output > 1); - $failure_cb->(2, "Malformed output from changer script: '$child_output[0]'") - if ($child_output[0] !~ /\s*([^\s]+)(?:\s+(.+))?/); + if (@child_output < 1) { + $failure_cb->(2, "Malformed output from changer script -- no output"); + return; + } + if (@child_output > 1) { + $failure_cb->(2, "Malformed output from changer script -- too many lines"); + return; + } + if ($child_output[0] !~ /\s*([^\s]+)(?:\s+(.+))?/) { + $failure_cb->(2, "Malformed output from changer script: '$child_output[0]'"); + return; + } my ($slot, $rest) = ($1, $2); - # mark this object as no longer busy. This frees the - # object up to begin the next operation, which may happen - # during the invocation of the callback - $self->{'busy'} = 0; - # let the callback take care of any further interpretation my $exitval = POSIX::WEXITSTATUS($child_exit_status); if ($exitval == 0) { @@ -481,6 +507,8 @@ package Amanda::Changer::compat::Reservation; use vars qw( @ISA ); @ISA = qw( Amanda::Changer::Reservation ); +use Amanda::Debug qw( :logging ); + sub new { my $class = shift; my ($chg, $slot, $device_name) = @_; @@ -502,7 +530,21 @@ sub do_release { my $self = shift; my %params = @_; - $self->{'chg'}->{'reserved'} = 0; + my $finished = sub { + my ($msg) = @_; + + $self->{'chg'}->{'reserved'} = 0; + + if (exists $params{'finished_cb'}) { + Amanda::MainLoop::call_later($params{'finished_cb'}, $msg); + } + }; + + if (exists $params{'eject'} && $params{'eject'}) { + $self->{'chg'}->eject(finished_cb => $finished); + } else { + $finished->(undef); + } } sub set_label { diff --git a/perl/Amanda/Changer/disk.pm b/perl/Amanda/Changer/disk.pm index 05e34a7..3b06362 100644 --- a/perl/Amanda/Changer/disk.pm +++ b/perl/Amanda/Changer/disk.pm @@ -387,4 +387,8 @@ sub do_release { or warn("Could not unlink '$drive/data': $!"); rmdir("$drive") or warn("Could not rmdir '$drive': $!"); + + if (exists $params{'finished_cb'}) { + Amanda::MainLoop::call_later($params{'finished_cb'}, undef); + } } diff --git a/perl/Amanda/Changer/single.pm b/perl/Amanda/Changer/single.pm index 33bf291..daad4a5 100644 --- a/perl/Amanda/Changer/single.pm +++ b/perl/Amanda/Changer/single.pm @@ -122,4 +122,8 @@ sub do_release { my %params = @_; $self->{'chg'}->{'reserved'} = 0; + + if (exists $params{'finished_cb'}) { + Amanda::MainLoop::call_later($params{'finished_cb'}, undef); + } } diff --git a/perl/Amanda/Paths.pm.in b/perl/Amanda/Paths.pm.in index bddc5e9..ef84481 100644 --- a/perl/Amanda/Paths.pm.in +++ b/perl/Amanda/Paths.pm.in @@ -53,6 +53,7 @@ use Exporter; $datarootdir $sysconfdir $amdatadir + $localstatedir $AMANDA_TMPDIR $CONFIG_DIR @@ -79,6 +80,7 @@ $mandir = "@mandir@"; $datarootdir = "@datarootdir@"; $sysconfdir = "@sysconfdir@"; $amdatadir = "@amdatadir@"; +$localstatedir = "@localstatedir@"; ## amanda configuration directories diff --git a/recover-src/amrecover.c b/recover-src/amrecover.c index 49dcd37..c7dbc7e 100644 --- a/recover-src/amrecover.c +++ b/recover-src/amrecover.c @@ -534,14 +534,18 @@ main( { char *their_feature_string = NULL; + indexsrv_features = NULL; + line = vstrallocf("FEATURES %s", our_features_string); if(exchange(line) == 0) { their_feature_string = stralloc(server_line+13); indexsrv_features = am_string_to_feature(their_feature_string); + if (!indexsrv_features) + g_printf(_("Bad feature string from server: %s"), their_feature_string); } - else { + if (!indexsrv_features) indexsrv_features = am_set_default_feature_set(); - } + amfree(their_feature_string); amfree(line); } diff --git a/recover-src/extract_list.c b/recover-src/extract_list.c index 26a6304..43b27a2 100644 --- a/recover-src/extract_list.c +++ b/recover-src/extract_list.c @@ -1753,7 +1753,7 @@ extract_files_child( } if (file.program != NULL) { - if (strcmp(file.program, "BACKUP") == 0) + if (strcmp(file.program, "APPLICATION") == 0) dumptype = IS_APPLICATION_API; #ifdef GNUTAR if (strcmp(file.program, GNUTAR) == 0) diff --git a/recover-src/set_commands.c b/recover-src/set_commands.c index 383aae1..f741ce9 100644 --- a/recover-src/set_commands.c +++ b/recover-src/set_commands.c @@ -466,7 +466,7 @@ cd_dir( if(dir[strlen(dir)-1] == '/') dir[strlen(dir)-1] = '\0'; /* remove last / */ /* remove everything before the last / */ - dir1 = rindex(dir,'/'); + dir1 = strrchr(dir,'/'); if (dir1) { dir1++; dir2 = stralloc(dir1); diff --git a/restore-src/amfetchdump.c b/restore-src/amfetchdump.c index 927149d..ec3d83d 100644 --- a/restore-src/amfetchdump.c +++ b/restore-src/amfetchdump.c @@ -146,7 +146,6 @@ list_needed_tapes( for(curmatch = matches; curmatch; curmatch = curmatch->next) { int havetape = 0; - g_fprintf(stderr, "Examining %s %s on %s\n", curmatch->hostname, curmatch->diskname, curmatch->label); /* keep only first dump if only_one */ if (only_one && curmatch != matches && @@ -154,7 +153,6 @@ list_needed_tapes( strcmp(curmatch->diskname, matches->diskname) || strcmp(curmatch->timestamp, matches->timestamp) || curmatch->level != matches->level)) { - g_fprintf(stderr, "only_one matched\n"); continue; } if(strcmp("OK", curmatch->status)){ @@ -162,7 +160,6 @@ list_needed_tapes( curmatch->timestamp, curmatch->hostname, curmatch->diskname, curmatch->level, curmatch->status); - g_fprintf(stderr, "!OK\n"); continue; } diff --git a/server-src/amcheck.c b/server-src/amcheck.c index 533a044..5e9653e 100644 --- a/server-src/amcheck.c +++ b/server-src/amcheck.c @@ -1744,6 +1744,7 @@ start_host( hostp->hostname, qname); g_fprintf(outf, _("Dumptype configuration is not GNUTAR or DUMP." " It is case sensitive\n")); + l = stralloc(""); } else { l = vstralloc("\n" " APPLICATION\n", NULL); @@ -1931,13 +1932,20 @@ handle_result( t = strstr(line, "features="); if(t != NULL && (g_ascii_isspace((int)t[-1]) || t[-1] == ';')) { + char *u = strchr(t, ';'); + if (u) + *u = '\0'; t += SIZEOF("features=")-1; am_release_feature_set(hostp->features); if((hostp->features = am_string_to_feature(t)) == NULL) { - g_fprintf(outf, _("ERROR: %s: bad features value: %s\n"), - hostp->hostname, line); + g_fprintf(outf, _("ERROR: %s: bad features value: '%s'\n"), + hostp->hostname, t); g_fprintf(outf, _("The amfeature in the reply packet is invalid\n")); + remote_errors++; + hostp->up = HOST_DONE; } + if (u) + *u = ';'; } continue; diff --git a/server-src/amcheckdump.pl b/server-src/amcheckdump.pl index dfa6f0c..15c7a97 100644 --- a/server-src/amcheckdump.pl +++ b/server-src/amcheckdump.pl @@ -102,13 +102,19 @@ sub find_next_device { my $load_sub = sub { my ($err) = @_; - die $err if $err; + if ($err) { + print STDERR $err, "\n"; + exit 1; + } $changer->load( label => $label, res_cb => sub { (my $err, $reservation) = @_; - die $err if $err; + if ($err) { + print STDERR $err, "\n"; + exit 1; + } Amanda::MainLoop::quit(); }, ); @@ -152,6 +158,11 @@ sub try_open_device { $device->error(), ".\n"; return undef; } + if (!$device->configure(1)) { + print "Could not configure device $device_name: ", + $device->error(), ".\n"; + return undef; + } my $label_status = $device->read_label(); if ($label_status != $DEVICE_STATUS_SUCCESS) { diff --git a/server-src/amindexd.c b/server-src/amindexd.c index 708d153..e1e1ba1 100644 --- a/server-src/amindexd.c +++ b/server-src/amindexd.c @@ -241,7 +241,7 @@ uncompress_file( /* clean the data with clean_backslash */ while (fgets(line, STR_SIZE, pipe_stream) != NULL) { if (line[0] != '\0') { - if (index(line,'/')) { + if (strchr(line,'/')) { clean_backslash(line); full_write(pipe_to_sort,line,strlen(line)); } @@ -1552,6 +1552,10 @@ main( our_feature_string = am_feature_to_string(our_features); their_feature_string = newstralloc(their_feature_string, arg); their_features = am_string_to_feature(their_feature_string); + if (!their_features) { + g_warning("Invalid client feature set '%s'", their_feature_string); + their_features = am_set_default_feature_set(); + } reply(200, "FEATURES %s", our_feature_string); amfree(our_feature_string); amfree(their_feature_string); diff --git a/server-src/amlabel.c b/server-src/amlabel.c index d733b29..a170f7c 100644 --- a/server-src/amlabel.c +++ b/server-src/amlabel.c @@ -281,6 +281,7 @@ main( g_printf(_("Success!\n")); } else { g_printf(_("\ntape not labeled\n")); + exit(EXIT_FAILURE); } g_object_unref(device); diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl index f176f31..ec8675f 100755 --- a/server-src/amserverconfig.pl +++ b/server-src/amserverconfig.pl @@ -30,7 +30,7 @@ my $confdir="$CONFIG_DIR"; my $tmpdir="$AMANDA_DBGDIR"; my $amandahomedir="$localstatedir/lib/amanda"; my $templatedir="$amdatadir/template.d"; #rpm install template files here -my $def_tapedev="file:/$amandahomedir/vtapes"; +my $def_tapedev="file:$amandahomedir/vtapes"; my $amanda_user="@CLIENT_LOGIN@"; my $def_config="@DEFAULT_CONFIG@"; diff --git a/server-src/amstatus.pl b/server-src/amstatus.pl index 538e565..07e9642 100644 --- a/server-src/amstatus.pl +++ b/server-src/amstatus.pl @@ -948,8 +948,8 @@ foreach $host (sort @hosts) { if( defined $starttime ) { print " (", &showtime($taper_time{$hostpart}), ")"; } - print ", ", $error{$hostpart} if defined($error{$hostpart} && - $error{$hostpart} ne ""); + print ", ", $error{$hostpart} if (defined($error{$hostpart}) && + $error{$hostpart} ne ""); print "\n"; } $tapartition++; @@ -960,6 +960,15 @@ foreach $host (sort @hosts) { else { $taesize += $size{$hostpart}; } + if (defined $dump_finished{$hostpart} && $dump_finished{$hostpart} == 1) { + $dpartition++; + $dsize += $size{$hostpart}; + if(defined $esize{$hostpart} && $esize{$hostpart} > 1) { + $desize += $esize{$hostpart}; + } else { + $desize += $size{$hostpart}; + } + } } elsif($taper_finished{$hostpart} < 0) { @@ -1014,6 +1023,15 @@ foreach $host (sort @hosts) { $wfpartition++; $wfsize += $xsize; } + if (defined $dump_finished{$hostpart} && $dump_finished{$hostpart} == 1) { + $dpartition++; + $dsize += $size{$hostpart}; + if(defined $esize{$hostpart} && $esize{$hostpart} > 1) { + $desize += $esize{$hostpart}; + } else { + $desize += $size{$hostpart}; + } + } } elsif($taper_finished{$hostpart} == 1) { if( defined $opt_finished ) { @@ -1035,17 +1053,21 @@ foreach $host (sort @hosts) { } print "\n"; } - $dpartition++; + if (defined $dump_finished{$hostpart} && $dump_finished{$hostpart} == 1) { + $dpartition++; + $dsize += $size{$hostpart}; + if(defined $esize{$hostpart} && $esize{$hostpart} > 1) { + $desize += $esize{$hostpart}; + } else { + $desize += $size{$hostpart}; + } + } $tpartition++; - $dsize += $size{$hostpart}; $tsize += $size{$hostpart}; - $desize += $esize{$hostpart}; if(defined $esize{$hostpart} && $esize{$hostpart} > 1) { - $desize += $esize{$hostpart}; $tesize += $esize{$hostpart}; } else { - $desize += $size{$hostpart}; $tesize += $size{$hostpart}; } } diff --git a/server-src/chunker.c b/server-src/chunker.c index caaf0bf..a652a76 100644 --- a/server-src/chunker.c +++ b/server-src/chunker.c @@ -238,6 +238,10 @@ main( } am_release_feature_set(their_features); their_features = am_string_to_feature(cmdargs->argv[a++]); + if (!their_features) { + error(_("error [chunker PORT-WRITE: invalid feature string]")); + /*NOTREACHED*/ + } if(a >= cmdargs->argc) { error(_("error [chunker PORT-WRITE: not enough args: diskname]")); diff --git a/server-src/driver.c b/server-src/driver.c index d7a6fea..e516121 100644 --- a/server-src/driver.c +++ b/server-src/driver.c @@ -135,7 +135,7 @@ static void startaflush(void); static void start_degraded_mode(disklist_t *queuep); static void start_some_dumps(disklist_t *rq); static void continue_port_dumps(void); -static void update_failed_dump_to_tape(disk_t *); +static void update_failed_dump(disk_t *); typedef enum { TAPE_ACTION_NO_ACTION = 0, @@ -1691,7 +1691,7 @@ dumper_taper_result( sched(dp)->est_kps); amfree(qname); } else { - update_failed_dump_to_tape(dp); + update_failed_dump(dp); } is_partial = dumper->result != DONE || taper_result != DONE; @@ -1767,6 +1767,8 @@ dumper_chunker_result( (long long)sched(dp)->est_csize, sched(dp)->est_kps); amfree(qname); + } else { + update_failed_dump(dp); } deallocate_bandwidth(dp->host->netif, sched(dp)->est_kps); @@ -2626,6 +2628,12 @@ read_schedule( dp->up = (char *) sp; if(dp->host->features == NULL) { dp->host->features = am_string_to_feature(features); + if (!dp->host->features) { + log_add(L_WARNING, + _("Invalid feature string from client '%s'"), + features); + dp->host->features = am_set_default_feature_set(); + } } remove_disk(&waitq, dp); if (dp->to_holdingdisk == HOLD_NEVER) { @@ -3093,13 +3101,9 @@ holdingdisk_state( } static void -update_failed_dump_to_tape( +update_failed_dump( disk_t * dp) { -/* JLM - * should simply set no_bump - */ - time_t save_timestamp = sched(dp)->timestamp; /* setting timestamp to 0 removes the current level from the * database, so that we ensure that it will not be bumped to the diff --git a/server-src/driverio.c b/server-src/driverio.c index 6b2cd1e..d16ab8c 100644 --- a/server-src/driverio.c +++ b/server-src/driverio.c @@ -808,13 +808,13 @@ update_info_dumper( newperf(perfp->rate, (double)dumpsize/(double)dumptime); } - if(getconf_int(CNF_RESERVE)<100) { + if(origsize >= (off_t)0 && getconf_int(CNF_RESERVE)<100) { info.command = NO_COMMAND; } - if(level == info.last_level) + if (origsize >= (off_t)0 && level == info.last_level) { info.consecutive_runs++; - else { + } else if (origsize >= (off_t)0 || level < info.last_level) { info.last_level = level; info.consecutive_runs = 1; } diff --git a/server-src/dumper.c b/server-src/dumper.c index af14723..ae04bb1 100644 --- a/server-src/dumper.c +++ b/server-src/dumper.c @@ -260,9 +260,8 @@ xml_check_options( char *errmsg = NULL; dle_t *dle; - char *uoptionstr = unquote_string(optionstr); - o = oo = vstralloc("", strchr(uoptionstr,'<'), "", NULL); - + o = oo = vstralloc("", strchr(optionstr,'<'), "", NULL); + dle = amxml_parse_node_CHAR(o, &errmsg); if (dle == NULL) { error("amxml_parse_node_CHAR failed: %s\n", errmsg); @@ -1865,6 +1864,9 @@ bad_nak: char ch; *p++ = '\0'; if(strncmp_const_skip(tok, "features=", tok, ch) == 0) { + char *u = strchr(tok, ';'); + if (u) + *u = '\0'; am_release_feature_set(their_features); if((their_features = am_string_to_feature(tok)) == NULL) { errstr = newvstrallocf(errstr, @@ -1872,6 +1874,8 @@ bad_nak: tok); goto parse_error; } + if (u) + *u = ';'; } tok = p; } @@ -2048,9 +2052,8 @@ startup_dump( amfree(dle_str); if (am_has_feature(their_features, fe_req_xml)) { - char *o, *p = NULL; + char *p = NULL; char *pclean; - o = unquote_string(options+1); vstrextend(&p, "\n", NULL); if (*application_api != '\0') { vstrextend(&p, " APPLICATION\n", NULL); @@ -2063,8 +2066,7 @@ startup_dump( NULL); } vstrextend(&p, " ", level_string, "\n", NULL); - vstrextend(&p, o, "\n", NULL); - amfree(o); + vstrextend(&p, options+1, "\n", NULL); pclean = clean_dle_str_for_client(p); vstrextend(&req, pclean, NULL); amfree(pclean); @@ -2087,7 +2089,7 @@ startup_dump( " ", dumpdate, " OPTIONS ", options, /* compat: if authopt=krb4, send krb4-auth */ - (strcasecmp(authopt, "krb4") ? "" : "krb4-auth"), + (authopt && strcasecmp(authopt, "krb4") ? "" : "krb4-auth"), "\n", NULL); } diff --git a/server-src/find.c b/server-src/find.c index ccf878d..631c4b8 100644 --- a/server-src/find.c +++ b/server-src/find.c @@ -248,7 +248,10 @@ search_holding_disk( new_output_find->label=stralloc(holding_file); new_output_find->partnum=stralloc("--"); new_output_find->filenum=0; - new_output_find->status=stralloc("OK"); + if (file.is_partial) + new_output_find->status=stralloc("PARTIAL"); + else + new_output_find->status=stralloc("OK"); *output_find=new_output_find; } dumpfile_free_data(&file); diff --git a/server-src/planner.c b/server-src/planner.c index 118d54e..02a4cb8 100644 --- a/server-src/planner.c +++ b/server-src/planner.c @@ -708,7 +708,7 @@ setup_estimate( if(get_info(dp->host->hostname, dp->name, &info)) { /* no record for this disk, make a note of it */ - log_add(L_INFO, _("Adding new disk %s:%s."), dp->host->hostname, dp->name); + log_add(L_INFO, _("Adding new disk %s:%s."), dp->host->hostname, qname); } /* setup working data struct for disk */ @@ -1822,6 +1822,9 @@ static void handle_result( if(strncmp_const(line, "OPTIONS ") == 0) { t = strstr(line, "features="); if(t != NULL && (g_ascii_isspace((int)t[-1]) || t[-1] == ';')) { + char *u = strchr(t, ';'); + if (u) + *u = '\0'; t += SIZEOF("features=")-1; am_release_feature_set(hostp->features); if((hostp->features = am_string_to_feature(t)) == NULL) { @@ -1829,6 +1832,8 @@ static void handle_result( _(": bad features value: %s\n"), line); goto error_return; } + if (u) + *u = ';'; } skip_quoted_line(s, ch); continue; @@ -1855,7 +1860,7 @@ static void handle_result( skip_quoted_line(s, ch); continue; } - t = index(t,'\n'); + t = strchr(t,'\n'); if (t) /* truncate after the first line */ *t = '\0'; errbuf = vstralloc(hostp->hostname, diff --git a/server-src/reporter.c b/server-src/reporter.c index f9fabea..1b2a8c2 100644 --- a/server-src/reporter.c +++ b/server-src/reporter.c @@ -1975,7 +1975,7 @@ handle_note(void) BSTRNCMP(curstr, "Taper protocol error") == 0) { exit_status |= STATUS_TAPE; } - pidstr = index(curstr,' '); + pidstr = strchr(curstr,' '); if (pidstr) { pidstr++; } @@ -2405,7 +2405,7 @@ handle_success( origkb = 0.1; } if (curprog == P_TAPER && logtype == L_PARTIAL) { - char *t = index(s-1,']'); + char *t = strchr(s-1,']'); if (t) { char *errmsg, *u; errmsg = unquote_string(t+1); diff --git a/server-src/taper-source.c b/server-src/taper-source.c index 20e7f0c..704177f 100644 --- a/server-src/taper-source.c +++ b/server-src/taper-source.c @@ -193,7 +193,7 @@ static gboolean default_taper_source_seek_to_part_start(TaperSource * self) { self->end_of_data = self->end_of_part = FALSE; - return TRUE; + return self->max_part_size > 0; } static gboolean diff --git a/server-src/taper.c b/server-src/taper.c index fed6a33..c1b7cc6 100644 --- a/server-src/taper.c +++ b/server-src/taper.c @@ -639,8 +639,14 @@ skip_volume: static void find_completion_tags(dump_info_t * dump_info, /* IN */ cmd_t * result_cmd, /* OUT */ logtype_t * result_log /* OUT */) { + /* result_cmd is always DONE because the taper wrote all the input to + * the output. driver need to know if the taper completed its job. + * result_log is set to L_PARTIAL if the image is partial, the log + * must tell if the image is partial or complete. + */ + if (taper_source_is_partial(dump_info->source)) { - *result_cmd = PARTIAL; + *result_cmd = DONE; *result_log = L_PARTIAL; } else { *result_cmd = DONE; diff --git a/xfer-src/Makefile.am b/xfer-src/Makefile.am index b7d77f6..1e5b6f0 100644 --- a/xfer-src/Makefile.am +++ b/xfer-src/Makefile.am @@ -31,6 +31,7 @@ libamxfer_la_SOURCES = \ xfer.c \ xmsg.c +libamxfer_la_LDFLAGS = -release $(VERSION) libamxfer_la_LIBADD = \ ../device-src/libamdevice.la \ ../common-src/libamanda.la diff --git a/xfer-src/Makefile.in b/xfer-src/Makefile.in index 6a96e89..9646a06 100644 --- a/xfer-src/Makefile.in +++ b/xfer-src/Makefile.in @@ -315,6 +315,9 @@ am_libamxfer_la_OBJECTS = dest-device.lo dest-fd.lo dest-null.lo \ source-random.lo source-fd.lo source-pattern.lo \ xfer-element.lo xfer.lo xmsg.lo libamxfer_la_OBJECTS = $(am_libamxfer_la_OBJECTS) +libamxfer_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libamxfer_la_LDFLAGS) $(LDFLAGS) -o $@ am__EXEEXT_1 = xfer-test$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_xfer_test_OBJECTS = xfer-test.$(OBJEXT) @@ -865,6 +868,7 @@ libamxfer_la_SOURCES = \ xfer.c \ xmsg.c +libamxfer_la_LDFLAGS = -release $(VERSION) libamxfer_la_LIBADD = \ ../device-src/libamdevice.la \ ../common-src/libamanda.la @@ -943,7 +947,7 @@ clean-amlibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libamxfer.la: $(libamxfer_la_OBJECTS) $(libamxfer_la_DEPENDENCIES) - $(LINK) -rpath $(amlibdir) $(libamxfer_la_OBJECTS) $(libamxfer_la_LIBADD) $(LIBS) + $(libamxfer_la_LINK) -rpath $(amlibdir) $(libamxfer_la_OBJECTS) $(libamxfer_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -- 2.30.2