From: Bdale Garbee Date: Mon, 28 Aug 2006 13:15:23 +0000 (-0400) Subject: Imported Debian patch 2.5.0p2-2 X-Git-Tag: debian/2.5.0p2-2^0 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=433127ec822be7e32052c69fc51cd35a3ae0e069;p=debian%2Famanda Imported Debian patch 2.5.0p2-2 --- diff --git a/client-src/sendbackup-gnutar.c b/client-src/sendbackup-gnutar.c index 4b4a000..720a31d 100644 --- a/client-src/sendbackup-gnutar.c +++ b/client-src/sendbackup-gnutar.c @@ -147,6 +147,9 @@ static void start_backup(host, disk, amdevice, level, dumpdate, dataf, mesgf, in char *error_pn = NULL; char *compopt = NULL; char *encryptopt = skip_argument; + int infd, outfd; + ssize_t nb; + char buf[32768]; error_pn = stralloc2(get_pname(), "-smbclient"); @@ -211,10 +214,7 @@ static void start_backup(host, disk, amdevice, level, dumpdate, dataf, mesgf, in char *s; int ch; char *inputname = NULL; - FILE *in = NULL; - FILE *out; int baselevel; - char *line = NULL; basename = vstralloc(GNUTAR_LISTED_INCREMENTAL_DIR, "/", @@ -235,12 +235,13 @@ static void start_backup(host, disk, amdevice, level, dumpdate, dataf, mesgf, in unlink(incrname); /* - * Open the listed incremental file for the previous level. Search + * Open the listed incremental file from the previous level. Search * backward until one is found. If none are found (which will also * be true for a level 0), arrange to read from /dev/null. */ baselevel = level; - while (in == NULL) { + infd = -1; + while (infd == -1) { if (--baselevel >= 0) { snprintf(number, sizeof(number), "%d", baselevel); inputname = newvstralloc(inputname, @@ -248,7 +249,7 @@ static void start_backup(host, disk, amdevice, level, dumpdate, dataf, mesgf, in } else { inputname = newstralloc(inputname, "/dev/null"); } - if ((in = fopen(inputname, "r")) == NULL) { + if ((infd = open(inputname, O_RDONLY)) == -1) { int save_errno = errno; dbprintf(("%s: error opening %s: %s\n", @@ -264,28 +265,27 @@ static void start_backup(host, disk, amdevice, level, dumpdate, dataf, mesgf, in /* * Copy the previous listed incremental file to the new one. */ - if ((out = fopen(incrname, "w")) == NULL) { + if ((outfd = open(incrname, O_WRONLY|O_CREAT, 0600)) == -1) { error("error [opening %s: %s]", incrname, strerror(errno)); } - for (; (line = agets(in)) != NULL; free(line)) { - if(fputs(line, out) == EOF || putc('\n', out) == EOF) { - error("error [writing to %s: %s]", incrname, strerror(errno)); + while ((nb = read(infd, &buf, sizeof(buf))) > 0) { + if (fullwrite(outfd, &buf, nb) < nb) { + error("error [writing to '%s': %s]", incrname, + strerror(errno)); } } - amfree(line); - if (ferror(in)) { + if (nb < 0) { error("error [reading from %s: %s]", inputname, strerror(errno)); } - if (fclose(in) == EOF) { + + if (close(infd) != 0) { error("error [closing %s: %s]", inputname, strerror(errno)); } - in = NULL; - if (fclose(out) == EOF) { + if (close(outfd) != 0) { error("error [closing %s: %s]", incrname, strerror(errno)); } - out = NULL; dbprintf(("%s: doing level %d dump as listed-incremental", debug_prefix_time("-gnutar"), level)); diff --git a/client-src/sendsize.c b/client-src/sendsize.c index 184409c..ecbe2b2 100644 --- a/client-src/sendsize.c +++ b/client-src/sendsize.c @@ -1454,6 +1454,9 @@ time_t dumpsince; char *file_exclude = NULL; char *file_include = NULL; times_t start_time; + int infd, outfd; + ssize_t nb; + char buf[32768]; if(options->exclude_file) nb_exclude += options->exclude_file->nb_element; if(options->exclude_list) nb_exclude += options->exclude_list->nb_element; @@ -1497,7 +1500,8 @@ time_t dumpsince; * be true for a level 0), arrange to read from /dev/null. */ baselevel = level; - while (in == NULL) { + infd = -1; + while (infd == -1) { if (--baselevel >= 0) { snprintf(number, sizeof(number), "%d", baselevel); inputname = newvstralloc(inputname, @@ -1505,7 +1509,7 @@ time_t dumpsince; } else { inputname = newstralloc(inputname, "/dev/null"); } - if ((in = fopen(inputname, "r")) == NULL) { + if ((infd = open(inputname, O_RDONLY)) == -1) { int save_errno = errno; dbprintf(("%s: gnutar: error opening %s: %s\n", @@ -1519,40 +1523,36 @@ time_t dumpsince; /* * Copy the previous listed incremental file to the new one. */ - if ((out = fopen(incrname, "w")) == NULL) { + if ((outfd = open(incrname, O_WRONLY|O_CREAT, 0600)) == -1) { dbprintf(("%s: opening %s: %s\n", debug_prefix(NULL), incrname, strerror(errno))); goto common_exit; } - for (; (line = agets(in)) != NULL; free(line)) { - if (fputs(line, out) == EOF || putc('\n', out) == EOF) { + while ((nb = read(infd, &buf, sizeof(buf))) > 0) { + if (fullwrite(outfd, &buf, nb) < nb) { dbprintf(("%s: writing to %s: %s\n", debug_prefix(NULL), incrname, strerror(errno))); goto common_exit; } } - amfree(line); - if (ferror(in)) { + if (nb < 0) { dbprintf(("%s: reading from %s: %s\n", debug_prefix(NULL), inputname, strerror(errno))); goto common_exit; } - if (fclose(in) == EOF) { + + if (close(infd) != 0) { dbprintf(("%s: closing %s: %s\n", debug_prefix(NULL), inputname, strerror(errno))); - in = NULL; goto common_exit; } - in = NULL; - if (fclose(out) == EOF) { + if (close(outfd) != 0) { dbprintf(("%s: closing %s: %s\n", debug_prefix(NULL), incrname, strerror(errno))); - out = NULL; goto common_exit; } - out = NULL; amfree(inputname); amfree(basename); diff --git a/config/config.guess b/config/config.guess index c38553d..396482d 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,9 +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 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2006-07-02' # 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 @@ -210,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -770,6 +771,8 @@ EOF case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -780,9 +783,6 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS_NT-*:*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -790,10 +790,10 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) + x86:Interix*:[3456]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[345]*) + EM64T:Interix*:[3456]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -831,6 +831,9 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -989,7 +992,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout diff --git a/config/config.sub b/config/config.sub index ad9f395..387c18d 100755 --- a/config/config.sub +++ b/config/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2006-07-02' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,7 +241,7 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -248,7 +249,8 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -274,11 +276,11 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ @@ -286,9 +288,6 @@ case $basic_machine in | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -318,7 +317,7 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -329,7 +328,7 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -358,11 +357,11 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -373,8 +372,6 @@ case $basic_machine in | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -1128,7 +1125,7 @@ case $basic_machine in sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1217,7 +1214,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1369,6 +1366,9 @@ else # system, and we'll never get to this point. case $basic_machine in + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1378,9 +1378,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 diff --git a/debian/amanda-common.dirs b/debian/amanda-common.dirs index 5b4d54a..c5b03cb 100644 --- a/debian/amanda-common.dirs +++ b/debian/amanda-common.dirs @@ -1,3 +1,3 @@ -etc +etc/xinetd.d usr/lib usr/share/lintian/overrides diff --git a/debian/amanda-server.dirs b/debian/amanda-server.dirs index 650b695..c1ee160 100644 --- a/debian/amanda-server.dirs +++ b/debian/amanda-server.dirs @@ -1,3 +1,4 @@ +etc/xinetd.d etc/amanda/DailySet1 usr/sbin usr/share/doc/amanda-server diff --git a/debian/changelog b/debian/changelog index 3f5299b..7e0a977 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +amanda (1:2.5.0p2-2) unstable; urgency=low + + * merge updated French translation, closes: #369243 + * merge updated Italian translation, closes: #369588 + * merge updated Czech translaterion, closes: #370299 + * merge updated Dutch translaterion, closes: #374850 + * merge updated Swedish translaterion, closes: #375747 + * rework postinst to use adduser instead of usermod to add user backup to + groups disk and tape, and add postrm support for removing user backup from + those groups on purge, closes: #380336 + * patch from upstream 2.5.1b1 via Geert Uytterhoeven to support tar 1.15.91, + closes: #378558 + * accept patch from Raphael Pinson adding xinetd support + * Clean debian/po/templates.pot after build + + -- Bdale Garbee Mon, 28 Aug 2006 09:15:23 -0400 + amanda (1:2.5.0p2-1) unstable; urgency=low * new upstream version diff --git a/debian/control b/debian/control index 8aa9589..bec53fd 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: amanda-common Architecture: any -Depends: ${shlibs:Depends}, netbase (>=3.03), tar (>=1.12), perl5, mailx, debconf | debconf-2.0 +Depends: ${shlibs:Depends}, netbase (>=3.03), tar (>=1.12), perl5, mailx, debconf | debconf-2.0, adduser Suggests: amanda-server (= ${Source-Version}) | amanda-client (= ${Source-Version}) Conflicts: amanda Replaces: amanda diff --git a/debian/po/ar.po b/debian/po/ar.po index 6219e3b..1e03969 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda_1:2.4.5-1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: 2005-07-19 18:48+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -26,14 +26,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "الرجاء دمج /var/lib/amandates و /var/lib/amanda/amandates." #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/cs.po b/debian/po/cs.po index 800d230..ea26fde 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,29 +15,28 @@ msgid "" msgstr "" "Project-Id-Version: amanda\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" -"PO-Revision-Date: 2005-03-01 14:27+0100\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" +"PO-Revision-Date: 2006-06-04 17:06+0200\n" "Last-Translator: Miroslav Kure \n" -"Language-Team: Czech \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: note #. Description -#: ../templates:3 -#, fuzzy +#: ../templates:1001 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" -msgstr "Spojte prosím /var/lib/amandates a /var/lib/amanda/amandates." +msgstr "Spojte prosím /var/lib/amandates a /var/lib/amanda/amandates" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" "amanda/amandates location, and remove the old file /var/lib/amandates." msgstr "" -"V systému máte soubor /var/lib/amandates i /var/lib/amanda/amandates. Oba " -"soubory prohlédnìte, zajímavý obsah sluète do /var/lib/amanda/amandates a " -"starý soubor /var/lib/amandates sma¾te." +"V systému máte soubor /var/lib/amandates i /var/lib/amanda/amandates. Oba " +"soubory prohlédněte, zajímavý obsah slučte do /var/lib/amanda/amandates a " +"starý soubor /var/lib/amandates smažte." diff --git a/debian/po/da.po b/debian/po/da.po index 3559359..dc52d60 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,14 +26,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "Venligst flet /var/lib/amandates og /var/lib/amanda/amandates." #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/de.po b/debian/po/de.po index ab46751..4c61e19 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "" @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/es.po b/debian/po/es.po index 56ac952..f07fdf2 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,14 +26,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "Por favor fusione los ficheros de datos" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/fr.po b/debian/po/fr.po index 7f7701a..513f4fe 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,3 +1,4 @@ +# translation of fr.po to French # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -13,33 +14,36 @@ # # Original french translation by an unknown contributor # +# Christian Perrier , 2006. msgid "" msgstr "" -"Project-Id-Version: amanda 2.4.4-2\n" +"Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" -"PO-Revision-Date: 2003-06-19 18:42+0100\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" +"PO-Revision-Date: 2006-05-28 17:13+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" #. Type: note #. Description -#: ../templates:3 -#, fuzzy +#: ../templates:1001 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" -msgstr "Veuillez fusionner /var/lib/amandates et /var/lib/amanda/amandates." +msgstr "" +"Fusion indispensable de /var/lib/amandates et /var/lib/amanda/amandates" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" "amanda/amandates location, and remove the old file /var/lib/amandates." msgstr "" -"/var/lib/amandates et /var/lib/amanda/amandates existent. Veuillez examiner " -"les fichiers et fusionner les données importantes dans le fichier /var/lib/" -"amanda/amandates ; supprimez ensuite l'ancien fichier /var/lib/amandates. " +"Les deux fichiers /var/lib/amandates et /var/lib/amanda/amandates existent. " +"Veuillez les examiner et fusionner les données importantes dans le fichier /" +"var/lib/amanda/amandates ; supprimez ensuite l'ancien fichier /var/lib/" +"amandates. " diff --git a/debian/po/it.po b/debian/po/it.po index e8d82b9..31e5ad9 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,9 +1,14 @@ +# Italian (it) translation of debconf templates for amanda +# Copyright (C) 2004 Software in the Public Interest +# This file is distributed under the same license as the amanda package. +# Luca Monducci , 2004-2006. +# msgid "" msgstr "" -"Project-Id-Version: amanda 1:2.4.4p2 (templates)\n" +"Project-Id-Version: amanda 1:2.5.0p2 italian debconf templates\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" -"PO-Revision-Date: 2004-05-14 12:16+0200\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" +"PO-Revision-Date: 2006-05-30 10:30+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -12,19 +17,18 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 -#, fuzzy +#: ../templates:1001 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "Unire /var/lib/amandates e /var/lib/amanda/amndates." #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" "amanda/amandates location, and remove the old file /var/lib/amandates." msgstr "" -"Esiste sia /var/lib/amandates che /var/lib/amanda/amandates. Controllare i " -"file e unire il contenuto interessante in /var/lib/amanda/amndates e " -"rimuovere i file inutili da /var/lib/amanadates." +"Esistono sia /var/lib/amandates che /var/lib/amanda/amandates. Controllare i " +"file e unire tutte le parti utili in /var/lib/amanda/amandates e poi " +"rimuovere il file /var/lib/amanadates." diff --git a/debian/po/ja.po b/debian/po/ja.po index ba1e9f1..c000202 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 2.4.4p2\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: 2004-02-21 01:08+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" @@ -26,14 +26,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "/var/lib/amandates ¤È /var/lib/amanda/amandates ¤ò¥Þ¡¼¥¸¤·¤Æ¤¯¤À¤µ¤¤¡£" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/nl.po b/debian/po/nl.po index 8697162..6c0e4a4 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,3 +1,6 @@ +# translation of amanda 1:2.5.0p2-1_templates.po to Dutch +# This file is distributed under the same license as the amanda package. +# Please see debian/copyright. # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -11,13 +14,16 @@ # # Developers do not need to manually edit POT or PO files. # +# Luk Claes , 2004 +# This is an unofficial translation +# msgid "" msgstr "" -"Project-Id-Version: amanda 1:2.4.4p2-2\n" +"Project-Id-Version: amanda 1:2.5.0p2-1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" -"PO-Revision-Date: 2004-03-25 18:32+0100\n" -"Last-Translator: Luk Claes \n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" +"PO-Revision-Date: 2006-06-18 20:45+0100\n" +"Last-Translator: Kurt De Bree \n" "Language-Team: Debian l10n Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" @@ -25,19 +31,19 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 -#, fuzzy +#: ../templates:1001 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "Voeg /var/lib/amandates en /var/lib/amanda/amandates samen." #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" "amanda/amandates location, and remove the old file /var/lib/amandates." msgstr "" -"U heeft /var/lib/amandates en /var/lib/amanda/amandates. Kijk deze bestanden " -"na en voeg de inhoud samen die u belangrijk vindt in /var/lib/amanda/" -"amandates, en verwijder het oude bestand /var/lib/amandates" +"Zowel /var/lib/amandates als /var/lib/amanda/amandates zijn op uw " +"systeemaanwezig. Kijk deze bestanden na en combineer de inhoud u belangrijk " +"vindt, in /var/lib/amanda/amandates, en verwijder het oude bestand /var/lib/" +"amandates." diff --git a/debian/po/pt.po b/debian/po/pt.po index f7df0a5..cb409e5 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda_1%3A2.4.4p1-1_pt\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: 2003-10-18 13:47+0100\n" "Last-Translator: Bruno Rodrigues \n" "Language-Team: Portuguese \n" @@ -26,7 +26,7 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "" @@ -34,7 +34,7 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 393be78..a03a2e6 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,14 +26,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "Por favor junte /var/lib/amandates e /var/lib/amanda/amandates." #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/ru.po b/debian/po/ru.po index 6457dd9..1d34ea4 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,14 +26,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "ðÏÖÁÌÕÊÓÔÁ, ÓÏÅÄÉÎÉÔÅ /var/lib/amandates É /var/lib/amanda/amandates." #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/sv.po b/debian/po/sv.po index a934c5a..bc2574f 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -11,35 +11,32 @@ # # Developers do not need to manually edit POT or PO files. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: amanda 1:2.5.0p2-1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" +"PO-Revision-Date: 2006-06-27 23:05+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #. Type: note #. Description -#: ../templates:3 -#, fuzzy +#: ../templates:1001 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" -msgstr "Sammanfoga /var/lib/amandates och /var/lib/amanda/amandates." +msgstr "Sammanfoga /var/lib/amandates och /var/lib/amanda/amandates" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" "amanda/amandates location, and remove the old file /var/lib/amandates." msgstr "" -"Du har både /var/lib/amandates och /var/lib/amanda/amandates. Var snäll och " -"gå igenom dessa filer, och sammanfoga innehållet som du bryr dig om till den " -"nya platsen /var/lib/amanda/amandates. Ta sedan bort den gamla filen /var/" -"lib/amandates." +"Du har både /var/lib/amandates och /var/lib/amanda/amandates. Granska dessa " +"filer och sammanfoga innehållet som du bryr dig om till den nya platsen /var/" +"lib/amanda/amandates. Ta sedan bort den gamla filen /var/lib/amandates." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 214756e..b06aa92 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,13 +18,13 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/po/vi.po b/debian/po/vi.po index 5634d92..b4e3320 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1/2.4.4p3-2\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-05-25 23:06-0600\n" +"POT-Creation-Date: 2006-08-28 13:34-0400\n" "PO-Revision-Date: 2005-05-05 13:29+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -17,14 +17,14 @@ msgstr "" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 #, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "Hãy kết hợp /var/lib/amandates và /var/lib/amanda/amandates" #. Type: note #. Description -#: ../templates:3 +#: ../templates:1001 msgid "" "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " "review the files, and merge the contents you care about to the /var/lib/" diff --git a/debian/postinst b/debian/postinst index 0c1f807..dcba6bf 100644 --- a/debian/postinst +++ b/debian/postinst @@ -13,7 +13,8 @@ if [ "$1" = configure ]; then groupadd -g 34 backup 2> /dev/null groupadd -g 26 tape 2> /dev/null - usermod -G disk,tape backup + adduser backup disk + adduser backup tape # in case we get installed first if [ ! -d /var/lib/amanda ]; then diff --git a/debian/postrm b/debian/postrm index e986d40..6c4bba9 100644 --- a/debian/postrm +++ b/debian/postrm @@ -26,6 +26,9 @@ case "$1" in fi rm -f ~backup/.amandahosts + + deluser backup disk + deluser backup tape ;; remove|upgrade|deconfigure) ;; diff --git a/debian/rules b/debian/rules index 5a051fe..80721f5 100755 --- a/debian/rules +++ b/debian/rules @@ -43,6 +43,7 @@ clean: -make clean -make distclean -rm -f build-stamp missing config/config.h common-src/genversion + -rm -f debian/po/templates.pot -find . -type d -name .deps -exec rm -rf {} \; -test -r /usr/share/misc/config.sub && \ @@ -72,6 +73,9 @@ binary-arch: build install -d $(r)/usr/share/doc/amanda-common/examples cp -a example/* $(r)/usr/share/doc/amanda-common/examples cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog + cp debian/xinetd.d/amandaidx $(server)/etc/xinetd.d + cp debian/xinetd.d/amidxtape $(server)/etc/xinetd.d + cp debian/xinetd.d/amanda $(r)/etc/xinetd.d dh_installmenu -a dh_installcron -a dh_installchangelogs -a diff --git a/debian/xinetd.d/amanda b/debian/xinetd.d/amanda new file mode 100644 index 0000000..981a8f1 --- /dev/null +++ b/debian/xinetd.d/amanda @@ -0,0 +1,12 @@ +# default: on +# description: The amanda service +service amanda +{ + disable = no + socket_type = dgram + protocol = udp + wait = yes + user = backup + group = backup + server = /usr/lib/amanda/amandad +} diff --git a/debian/xinetd.d/amandaidx b/debian/xinetd.d/amandaidx new file mode 100644 index 0000000..ee2330c --- /dev/null +++ b/debian/xinetd.d/amandaidx @@ -0,0 +1,12 @@ +#default: on +# description: The amanda index service +service amandaidx +{ + disable = no + socket_type = stream + protocol = tcp + wait = no + user = backup + group = backup + server = /usr/lib/amanda/amindexd +} diff --git a/debian/xinetd.d/amidxtape b/debian/xinetd.d/amidxtape new file mode 100644 index 0000000..23f954d --- /dev/null +++ b/debian/xinetd.d/amidxtape @@ -0,0 +1,12 @@ +#default: on +# description: The amanda tape service +service amidxtape +{ + disable = no + socket_type = stream + protocol = tcp + wait = no + user = backup + group = backup + server = /usr/lib/amanda/amidxtaped +} diff --git a/man/amrestore.8 b/man/amrestore.8 index e4afea3..feb8d4e 100644 --- a/man/amrestore.8 +++ b/man/amrestore.8 @@ -18,149 +18,238 @@ .IP "\\$1" \\$2 .. .TH "AMRESTORE" 8 "" "" "" -.SH NAME -amrestore \- extract backup images from an Amanda tape +.SH "NAME" +amrestore - extract backup images from an Amanda tape .SH "SYNOPSIS" -.ad l -.hy 0 .HP 10 -\fBamrestore\fR [\fB\-r\fR | \fB\-c\fR | \fB\-C\fR] [\-b\ \fIblocksize\fR] [\-f\ \fIfileno\fR] [\-l\ \fIlabel\fR] [\-p] [\-h] \fB\fItapedevice\fR\fR | \fB\fIholdingfile\fR\fR | \fB\fIhostname\fR\ [\fIdiskname\fR\ [\fIdatestamp\fR]]\fR \&.\&.\&. -.ad -.hy - +\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...]]]]]] .SH "DESCRIPTION" - -.PP -\fBAmrestore\fR extracts backup images from the tape mounted on \fBtapedevice\fR or from the holding disk file \fBholdingfile\fR that match \fBhostname\fR, \fBdiskname\fR and \fBdatestamp\fR patterns given on the command line\&. The tape or holding file must be in a format written by the \fBamdump\fR or \fBamflush\fR program\&. - -.PP -If \fBdiskname\fR is not specified, all backups on the tape for the previous \fBhostname\fR are candidates\&. If \fBdatestamp\fR is not specified, all backups on the tape for the previous \fBhostname\fR and \fBdiskname\fR are candidates\&. If no \fBhostname\fR, \fBdiskname\fR or \fBdatestamp\fR are specified, every backup on the tape is a candidate\&. - -.PP -\fBHostname\fR and \fBdiskname\fR are special expressions described in the "HOST & DISK EXPRESSION" section of \fBamanda\fR(8)\&. \fBDatestamp\fR are special expression described in the "DATESTAMP EXPRESSION" section of \fBamanda\fR(8)\&. For example, if \fBdiskname\fR is "rz[23]a", it would match disks \fBrz2a\fR and \fBrz3a\fR\&. - -.PP -\fBDatestamp\fR is useful if \fBamflush\fR writes multiple backup runs to a single tape\&. - -.PP -Unless \fB\-p\fR is used, candidate backup images are extracted to files in the current directory named: - .PP -\fBhostname\&.diskname\&.datestamp\&.dumplevel\fR - -.PP -Amrestore doesn't use a changer, it restore from the tape already loaded in the \fBtapedevice\&.\fR - +\fBAmrestore\fR +extracts backup images from the tape mounted on +\fBtapedevice\fR +or from the holding disk file +\fBholdingfile\fR +that match +\fBhostname\fR, +\fBdiskname\fR +and +\fBdatestamp\fR +patterns given on the command line. The tape or holding file must be in a format written by the +\fBamdump\fR +or +\fBamflush\fR +program. +.PP +If +\fBdiskname\fR +is not specified, all backups on the tape for the previous +\fBhostname\fR +are candidates. If +\fBdatestamp\fR +is not specified, all backups on the tape for the previous +\fBhostname\fR +and +\fBdiskname\fR +are candidates. If no +\fBhostname\fR, +\fBdiskname\fR +or +\fBdatestamp\fR +are specified, every backup on the tape is a candidate. +.PP +\fBHostname\fR +and +\fBdiskname\fR +are special expressions described in the "HOST & DISK EXPRESSION" section of +\fBamanda\fR(8). +\fBDatestamp\fR +are special expression described in the "DATESTAMP EXPRESSION" section of +\fBamanda\fR(8). For example, if +\fBdiskname\fR +is "rz[23]a", it would match disks +\fBrz2a\fR +and +\fBrz3a\fR. +.PP +\fBDatestamp\fR +is useful if +\fBamflush\fR +writes multiple backup runs to a single tape. +.PP +Unless +\fB-p\fR +is used, candidate backup images are extracted to files in the current directory named: +.PP +\fBhostname.diskname.datestamp.dumplevel\fR +.PP +Amrestore doesn't use a changer, it restore from the tape already loaded in the +\fBtapedevice.\fR .SH "OPTIONS" - .TP -\fB\-b\fR -Set the blocksize used to read the tape or holding file\&. All holding files must be read with a blocksize of 32 KBytes\&. \fBAmrestore\fR should normally be able to determine the blocksize for tapes on its own and not need this parameter\&. - +\fB-b\fR +Set the blocksize used to read the tape or holding file. All holding files must be read with a blocksize of 32 KBytes. +\fBAmrestore\fR +should normally be able to determine the blocksize for tapes on its own and not need this parameter. .PP -The default is 32 KBytes\&. - +The default is 32 KBytes. .TP -\fB\-f\fR -Do a rewind followed by a fsf before trying to restore an image\&. - +\fB-f\fR +Do a rewind followed by a fsf before trying to restore an image. .TP -\fB\-l\fR -Check if we restoring from the tape with the right \fBlabel\fR - +\fB-l\fR +Check if we restoring from the tape with the right +\fBlabel\fR .TP -\fB\-p\fR -Pipe output\&. The first matching backup image is sent to standard output, which is normally a pipe to \fBrestore\fR or \fBtar\fR, then \fBamrestore\fR quits\&. It may be run again to continue selecting backups to process\&. Make sure you specify the no\-rewind \fBtapedevice\fR when doing this\&. - -.PP -Note: \fBrestore\fR may report "short read" errors when reading from a pipe\&. Most versions of \fBrestore\fR support a blocking factor option to let you set the read block size, and you should set it to 2\&. See the example below\&. - +\fB-p\fR +Pipe output. The first matching backup image is sent to standard output, which is normally a pipe to +\fBrestore\fR +or +\fBtar\fR, then +\fBamrestore\fR +quits. It may be run again to continue selecting backups to process. Make sure you specify the no-rewind +\fBtapedevice\fR +when doing this. +.PP +Note: +\fBrestore\fR +may report "short read" errors when reading from a pipe. Most versions of +\fBrestore\fR +support a blocking factor option to let you set the read block size, and you should set it to 2. See the example below. .TP -\fB\-c\fR -Compress output using the fastest method the compression program provides\&. \fBAmrestore\fR normally writes output files in a format understood by \fBrestore\fR or \fBtar\fR, even if the backups on the tape are compressed\&. With the \fB\-c\fR or \fB\-C\fR option, \fBamrestore\fR writes all files in compressed format, even if the backups on the tape are not compressed\&. Output file names will have a \&.Z or \&.gz extension depending on whether \fBcompress\fR or \fBgzip\fR is the preferred compression program\&. This option is useful when the current directory disk is small\&. - +\fB-c\fR +Compress output using the fastest method the compression program provides. +\fBAmrestore\fR +normally writes output files in a format understood by +\fBrestore\fR +or +\fBtar\fR, even if the backups on the tape are compressed. With the +\fB-c\fR +or +\fB-C\fR +option, +\fBamrestore\fR +writes all files in compressed format, even if the backups on the tape are not compressed. Output file names will have a +.Z +or +.gz +extension depending on whether +\fBcompress\fR +or +\fBgzip\fR +is the preferred compression program. This option is useful when the current directory disk is small. .TP -\fB\-C\fR -Compress output using the best method the compression program provides (may be very CPU intensive)\&. See the notes above about the \fB\-c\fR option\&. - +\fB-C\fR +Compress output using the best method the compression program provides (may be very CPU intensive). See the notes above about the +\fB-c\fR +option. .TP -\fB\-r\fR -Raw output\&. Backup images are output exactly as they are on the tape, including the \fBamdump\fR headers\&. Output file names will have a \&.RAW extension\&. This option is only useful for debugging and other strange circumstances\&. - +\fB-r\fR +Raw output. Backup images are output exactly as they are on the tape, including the +\fBamdump\fR +headers. Output file names will have a +.RAW +extension. This option is only useful for debugging and other strange circumstances. .TP -\fB\-h\fR -Header output\&. The tape header block is output at the beginning of each file\&. This is like \fB\-r\fR except \fB\-c\fR or \fB\-C\fR may also be used to compress the result\&. \fBAmrecover\fR uses the header to determine the restore program to use\&. - -.PP -If a header is written (\-r or \-h), only 32 KBytes are output regardless of the tape blocksize\&. This makes the resulting image usable as a holding file\&. - +\fB-h\fR +Header output. The tape header block is output at the beginning of each file. This is like +\fB-r\fR +except +\fB-c\fR +or +\fB-C\fR +may also be used to compress the result. +\fBAmrecover\fR +uses the header to determine the restore program to use. +.PP +If a header is written (-r or -h), only 32 KBytes are output regardless of the tape blocksize. This makes the resulting image usable as a holding file. .SH "EXAMPLES" - .PP -The following does an interactive restore of disk \fBrz3g\fR from host \fBseine\fR, to restore particular files\&. Note the use of the \fBb\fR option to \fBrestore\fR, which causes it to read in units of two 512\-byte blocks (1 Kbyte) at a time\&. This helps keep it from complaining about short reads\&. - +The following does an interactive restore of disk +\fBrz3g\fR +from host +\fBseine\fR, to restore particular files. Note the use of the +\fBb\fR +option to +\fBrestore\fR, which causes it to read in units of two 512-byte blocks (1 Kbyte) at a time. This helps keep it from complaining about short reads. +.sp .nf -% amrestore \-p /dev/nrmt9 seine rz3g | restore \-ivbf 2 \- +% amrestore -p /dev/nrmt9 seine rz3g | restore -ivbf 2 - .fi - +.sp .PP -The next example extracts all backup images for host \fBseine\fR\&. This is the usual way to extract all data for a host after a disk crash\&. - +The next example extracts all backup images for host +\fBseine\fR. This is the usual way to extract all data for a host after a disk crash. +.sp .nf % amrestore /dev/nrmt9 seine .fi - -.PP -If the backup datestamp in the above example is 19910125 and \fBseine\fR has level 0 backups of disks \fBrz1a\fR and \fBrz1g\fR on the tape, these files will be created in the current directory: - +.sp +.PP +If the backup datestamp in the above example is +19910125 +and +\fBseine\fR +has level 0 backups of disks +\fBrz1a\fR +and +\fBrz1g\fR +on the tape, these files will be created in the current directory: +.sp .nf -seine\&.rz1a\&.19910125\&.0 -seine\&.rz1g\&.19910125\&.0 +seine.rz1a.19910125.0 +seine.rz1g.19910125.0 .fi - +.sp .PP -You may also use \fBamrestore\fR to extract a backup image from a holding disk file that has not yet been flushed to tape: - +You may also use +\fBamrestore\fR +to extract a backup image from a holding disk file that has not yet been flushed to tape: +.sp .nf -% amrestore \-p /amanda/20001119/seine\&.rz1a\&.2 | restore \-ivbf 2 \- +% amrestore -p /amanda/20001119/seine.rz1a.2 | restore -ivbf 2 - .fi - +.sp .PP -\fBAmrestore\fR may be used to generate a listing of images on a tape: - +\fBAmrestore\fR +may be used to generate a listing of images on a tape: +.sp .nf -% mt \-f /dev/nrmt9 rewind -% amrestore \-p /dev/nrmt9 no\-such\-host > /dev/null +% mt -f /dev/nrmt9 rewind +% amrestore -p /dev/nrmt9 no-such-host > /dev/null .fi - +.sp .PP -This asks \fBamrestore\fR to find images for host \fBno\-such\-host\fR\&. It will not find any entries that match, but along the way will report each image it skips\&. - +This asks +\fBamrestore\fR +to find images for host +\fBno-such-host\fR. It will not find any entries that match, but along the way will report each image it skips. .SH "CAVEATS" - .PP -\fBGNU\-tar\fR must be used to restore files from backup images created with the GNUTAR dumptype\&. Vendor tar programs sometimes fail to read GNU tar images\&. - +\fBGNU-tar\fR +must be used to restore files from backup images created with the GNUTAR dumptype. Vendor tar programs sometimes fail to read GNU tar images. .SH "AUTHOR" - .PP -James da Silva, , University of Maryland, College Park: Original text - +James da Silva, +, University of Maryland, College Park: Original text .PP -Stefan G\&. Weichinger, , maintainer of the \fBAmanda\fR\-documentation: XML\-conversion - +Stefan G. Weichinger, +, maintainer of the +\fBAmanda\fR-documentation: XML-conversion .SH "SEE ALSO" - .PP -\fBamanda\fR(8), \fBamdump\fR(8), \fBamflush\fR(8), \fBtar\fR(1) \fBrestore\fR(8) +\fBamanda\fR(8), +\fBamdump\fR(8), +\fBamflush\fR(8), +\fBtar\fR(1)\fBrestore\fR(8) diff --git a/man/amtoc.8 b/man/amtoc.8 index 79b1275..ef22913 100644 --- a/man/amtoc.8 +++ b/man/amtoc.8 @@ -18,114 +18,115 @@ .IP "\\$1" \\$2 .. .TH "AMTOC" 8 "" "" "" -.SH NAME -amtoc \- generate TOC (Table Of Contents) for an Amanda run +.SH "NAME" +amtoc - generate TOC (Table Of Contents) for an Amanda run .SH "SYNOPSIS" -.ad l -.hy 0 .HP 6 -\fBamtoc\fR [\-a] [\-i] [\-t] [\-f\ \fIfile\fR] [\-s\ \fIsubs\fR] [\-w] [\-\-] \fIlogfile\fR -.ad -.hy - +\fBamtoc\fR [-a] [-i] [-t] [-f \fIfile\fR] [-s \fIsubs\fR] [-w] [--] \fIlogfile\fR .SH "DESCRIPTION" - .PP -\fBAmtoc\fR generates a table of contents for an \fBAmanda\fR run\&. It's a perl script (if you don't have perl, install it first!)\&. - +\fBAmtoc\fR +generates a table of contents for an +\fBAmanda\fR +run. It's a perl script (if you don't have perl, install it first!). .SH "OPTIONS" - .TP -\fB\-a\fR -The output file name will be \fBlabel\-of\-the\-tape\fR\&.toc in the same directory as \fBlogfile\fR\&. - +\fB-a\fR +The output file name will be +\fBlabel-of-the-tape\fR.toc in the same directory as +\fBlogfile\fR. .TP -\fB\-i\fR -Display help about \fBamtoc\fR\&. - +\fB-i\fR +Display help about +\fBamtoc\fR. .TP -\fB\-t\fR -Generate the output in tabular form\&. - +\fB-t\fR +Generate the output in tabular form. .TP -\fB\-f file\fR -Write the output to a file ('\-' for stdout)\&. - +\fB-f file\fR +Write the output to a file ('-' for stdout). .TP -\fB\-s subs\fR -Evaluate the output file name from \fBsubs\fR, with $_ set to \fBlabel\-of\-the\-tape\fR\&. The \fB\-a\fR option is equivalent to \fB\-s\fR \fI's/$_/\&.toc/'\fR\&. - +\fB-s subs\fR +Evaluate the output file name from +\fBsubs\fR, with $_ set to +\fBlabel-of-the-tape\fR. The +\fB-a\fR +option is equivalent to +\fB-s\fR\fI's/$_/.toc/'\fR. .TP -\fB\-w\fR -Separate tapes with form\-feeds and display blank lines before totals\&. - +\fB-w\fR +Separate tapes with form-feeds and display blank lines before totals. .TP -\fB\-\-\fR -Marks the last option so the next parameter is the \fBlogfile\fR\&. - +\fB--\fR +Marks the last option so the next parameter is the +\fBlogfile\fR. .TP \fBlogfile\fR -(use '\-' for stdin) - +(use '-' for stdin) .SH "OUTPUT FORMAT" - .PP The standard output has five fields separated by two spaces: - +.sp .nf # Server:/partition date level size[Kb] -0 daily\-05: 19991005 \- \- +0 daily-05: 19991005 - - 1 cuisun15:/cuisun15/home 19991005 1 96 2 cuinfs:/export/dentiste 19991005 1 96 - \&.\&.\&. + ... 103 cuisg11:/ 19991005 0 4139136 -103 total: \- \- 16716288 +103 total: - - 16716288 .fi - .PP -In tabular format (\-t), this would look like: - +In tabular format (-t), this would look like: +.sp .nf # Server:/partition date lev size[Kb] - 0 daily\-05: 19991005 \- \- + 0 daily-05: 19991005 - - 1 cuisun15:/cuisun15/home 19991005 1 96 2 cuinfs:/export/dentiste 19991005 1 96 - \&.\&.\&. + ... 103 cuisg11:/ 19991005 0 4139136 -103 total: \- \- 16716288 +103 total: - - 16716288 .fi - .SH "USAGE" - .PP -The easiest way to use it is to run \fBamtoc\fR right after \fBamdump\fR in the \fBcron job:\fR - +The easiest way to use it is to run +\fBamtoc\fR +right after +\fBamdump\fR +in the +\fBcron job:\fR +.sp .nf -amdump daily ; logdir=`amgetconf daily logdir` ; amtoc \-a $logdir/amdump.1 +amdump daily ; logdir=`amgetconf daily logdir` ; log=`ls -1t $logdir/log.*.[0-9] | head -1` ; amtoc -a $log .fi - +.sp .PP -which will generate /usr/local/etc/amanda//daily/\fBtape_label\fR\&.toc\&. You may also want to call \fBamtoc\fR after an \fBamflush\fR\&. - +which will generate /usr/local/etc/amanda//daily/\fBtape_label\fR.toc. You may also want to call +\fBamtoc\fR +after an +\fBamflush\fR. .SH "SEE ALSO" - .PP -\fBamanda\fR(8), \fBamdump\fR(8), \fBamflush\fR(8), \fBamgetconf\fR(8), cron, perl - +\fBamanda\fR(8), +\fBamdump\fR(8), +\fBamflush\fR(8), +\fBamgetconf\fR(8), cron, perl .SH "AUTHOR" - .PP -Nicolas Mayencourt , University of Geneva/Switzerland : Original text - +Nicolas Mayencourt +, University of Geneva/Switzerland : Original text .PP -Stefan G\&. Weichinger, , maintainer of the \fBAmanda\fR\-documentation: XML\-conversion +Stefan G. Weichinger, +, maintainer of the +\fBAmanda\fR-documentation: XML-conversion