/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
/*
* $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $
*
- * manage amandates file, that mimics /etc/dumpdates, but stores
+ * manage amandates file, that mimics /var/lib/dumpdates, but stores
* GNUTAR dates
*/
devname = amname_to_devname(amdp->name);
- if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) {
+ if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) {
amfree(devname);
return;
}
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
check_file(COMPRESS_PATH, X_OK);
if (need_dump || need_xfsdump ) {
- if (check_file_exist("/etc/dumpdates")) {
- check_file("/etc/dumpdates",
+ if (check_file_exist("/var/lib/dumpdates")) {
+ check_file("/var/lib/dumpdates",
#ifdef USE_RUNDUMP
F_OK
#else
} else {
#ifndef USE_RUNDUMP
if (access("/etc", R_OK|W_OK) == -1) {
- g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno));
+ g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno));
}
#endif
}
}
if (need_vdump) {
- if (check_file_exist("/etc/vdumpdates")) {
- check_file("/etc/vdumpdates", F_OK);
+ if (check_file_exist("/var/lib/vdumpdates")) {
+ check_file("/var/lib/vdumpdates", F_OK);
}
}
check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */
#endif
+ check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */
check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */
}
}
FILE *release = fopen("/etc/lsb-release", "r");
distro = "Ubuntu";
if (release) {
- char *result;
- while ((result = fgets(line, 1024, release))) {
+ while (fgets(line, 1024, release)) {
if (strstr(line, "DESCRIPTION")) {
platform = strchr(line, '=');
if (platform) platform++;
if (result) {
platform = line;
}
+ fclose(release);
}
- fclose(release);
}
amfree(uname);
}
# Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
#
- # This program is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License version 2 as published
- # by the Free Software Foundation.
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
'plugin' => '"script-email"',
'execute-on' => 'pre-host-backup, post-host-backup',
'execute-where' => 'client',
- 'property' => '"mailto" "amandabackup" "amanda"',
+ 'property' => '"mailto" "backup" "amanda"',
]);
$testconf->add_device('my_device', [
'comment' => '"my device is mine, not yours"',
);
for my $pn (@prop_names) {
- is_deeply($properties->{$pn->{'val'}}->{values}, [ "VALUE" ]);
+ is_deeply($properties->{$pn->{'val'}}->{values}, [ "VALUE" ], "property $pn->{'val'}");
}
$testconf = Installcheck::Config->new();
.\" Title: amaddclient
.\" Author: Kevin Till <kevin.till@zmanda.com>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: System Administration Commands
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "AMADDCLIENT" "8" "07/25/2012" "Amanda 3\&.3\&.2" "System Administration Commands"
+ .TH "AMADDCLIENT" "8" "01/10/2013" "Amanda 3\&.3\&.3" "System Administration Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.PP
\fBamaddclient\fR
-must be run by user amandabackup\&.
+must be run by user backup\&.
.PP
\-\-config, \-\-client and \-\-diskdev must be specified\&.
.SH "OPTIONS"
.PP
\fB/var/lib/amanda\fR
.RS 4
-amandabackup home directory
+backup home directory
.RE
.PP
\fB/var/lib/amanda/\&.amandahosts\fR
.\" Title: amanda-auth
.\" Author: Jean-Louis Martineau <martineau@zmanda.com>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: Miscellanea
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "AMANDA\-AUTH" "7" "07/25/2012" "Amanda 3\&.3\&.2" "Miscellanea"
+ .TH "AMANDA\-AUTH" "7" "01/10/2013" "Amanda 3\&.3\&.3" "Miscellanea"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.PP
When Amanda is built, a username is specified with the
\fB\-\-with\-user\fR
-option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqamandabackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqamandabackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
+option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqbackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqbackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
.SS "Authenticated Peer Hostnames"
.PP
Amanda\*(Aqs authentication mechanisms provide an authenticated hostname of the system on the other end of the connection, which is used to restrict access to only particular hosts\&. The degree of "authentication" performed on this hostname varies with the authentication mechanism, and is discussed below\&.
(which is equivalent to
\fBamdump\fR)\&.
.PP
-Example of the \&.amandahosts file on an Amanda client, where \*(Aqamandabackup\*(Aq is the Amanda dumpuser\&.
+Example of the \&.amandahosts file on an Amanda client, where \*(Aqbackup\*(Aq is the Amanda dumpuser\&.
.sp
.nf
- \fBamandaserver\&.example\&.com amandabackup amdump\fR
+ \fBamandaserver\&.example\&.com backup amdump\fR
.fi
.PP
Example of the \&.amandahosts file on an Amanda server
The authentication is done using \&.amandahosts files in the Amanda user\*(Aqs home directory\&. It uses UDP protocol between Amanda server and client for data and hence the number of DLEs is limited by the UDP packet size\&. It uses one TCP port to establish the connection and multiplexes all data streams using one port on the server (see PORT USAGE below)\&.
.SS "bsdtcp communication and authentication"
.PP
-The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: amandabackup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
+The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: backup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
.SS "USING INETD SERVER"
.PP
Template for Amanda client inetd service entry
.PP
Client example of using
\fBbsd\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
.sp
.nf
-\fB amanda dgram udp wait amandabackup /path/to/amandad amandad \-auth=bsd amdump\fR
+\fB amanda dgram udp wait backup /path/to/amandad amandad \-auth=bsd amdump\fR
.fi
.PP
The same could be used for
.PP
Client example of using
\fBbsdtcp\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
.sp
.nf
-\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
+\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
.fi
.PP
\fBamindexd\fR
.PP
Server example of using
\fBbsdtcp\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
.sp
.nf
-\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
+\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
.fi
.PP
For Amanda version 2\&.5\&.0 and earlier, remember that neither
Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2\&.5\&.0 or earlier server or a newer server having 2\&.5\&.0 or earlier clients
.sp
.nf
-\fB amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd\fR
-\fB amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
+\fB amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd\fR
+\fB amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
.fi
.SS "USING XINETD SERVER"
.PP
.PP
Client example of using
\fBbsd\fR
-authorization for xinetd server and for Amanda user "amandabackup":
+authorization for xinetd server and for Amanda user "backup":
.sp
.nf
service amanda
socket_type = dgram
protocol = udp
wait = yes
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = /path/to/amandad
.PP
Client example of using
\fBbsdtcp\fR
-authorization for xinetd server and for Amanda user "amandabackup":
+authorization for xinetd server and for Amanda user "backup":
.sp
.nf
service amanda
socket_type = stream
protocol = tcp
wait = no
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = /path/to/amandad
define dumptype rsh_example {
\&.\&.\&.
auth "rsh"
- client\-username "amandabackup"
+ client\-username "backup"
amandad\-path "/usr/lib/exec/amandad"
\&.\&.\&.
}
Enable SSH authentication and set the \fBssh\-keys\fR option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda\&.conf:
auth "ssh"
- ssh\-keys "/home/amandabackup/\&.ssh/id_rsa_amdump"
+ ssh\-keys "/home/backup/\&.ssh/id_rsa_amdump"
\fBssh\-keys\fR is the path to the private key on the client\&. If the username to which Amanda should connect is different from the default, then you should also add
.\" Title: amanda.conf
.\" Author: James da Silva <jds@amanda.org>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: File formats and conventions
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "AMANDA\&.CONF" "5" "07/25/2012" "Amanda 3\&.3\&.2" "File formats and conventions"
+ .TH "AMANDA\&.CONF" "5" "01/10/2013" "Amanda 3\&.3\&.3" "File formats and conventions"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.RE
.RE
.PP
+ \fBreport\-use\-media\fR \fIboolean\fR
+ .RS 4
+ Default:
+ \fITrue\fR
+ if
+ \fBmax\-dle\-by\-volume\fR
+ is not set,
+ \fIFalse\fR
+ if it is set\&. If the reporter must print the list of media used in the run\&.
+ .RE
+ .PP
+ \fBreport\-next\-media\fR \fIboolean\fR
+ .RS 4
+ Default:
+ \fITrue\fR
+ if
+ \fBmax\-dle\-by\-volume\fR
+ is not set,
+ \fIFalse\fR
+ if it is set\&. If the reporter must print the list of media expected for the next run\&.
+ .RE
+ .PP
\fBmax\-dle\-by\-volume\fR \fIint\fR
.RS 4
Default:
\fBrecord\fR \fIboolean\fR
.RS 4
Default:
-\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
-/etc/dumpdates
+\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
+/var/lib/dumpdates
for DUMP or
/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\&.
.PP
\fBpart\-size\fR \fIint\fR
.RS 4
- Default: none\&. This is the size (in KB if no units are specified) of each split part written to the volume\&. It is reduced to
- \fBpart\-cache\-max\-size\fR
- when part caching is required\&. If this is set to zero, then no splitting will take place; in this case, some devices can span dumps from volume to volume, while others will cause the entire dump to fail if they encounter end\-of\-medium before the dump is complete\&. See "Dump Splitting Configuration" below\&.
+ If this is set to zero (default), then no splitting will take place, and the entire dump will fail, if end\-of\-medium is encountered before the dump is complete, unless the device property LEOM is true, and the device can detect EOM\&. See "Dump Splitting Configuration" below\&.
.RE
.PP
\fBpart\-cache\-type\fR [ \fBnone\fR | \fBdisk\fR | \fBmemory\fR ]
.\" Title: amgpgcrypt
.\" Author: Kevin Till <kevin.till@zmanda.com>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: System Administration Commands
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "AMGPGCRYPT" "8" "07/25/2012" "Amanda 3\&.3\&.2" "System Administration Commands"
+ .TH "AMGPGCRYPT" "8" "01/10/2013" "Amanda 3\&.3\&.3" "System Administration Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
from Real Name, Comment and Email Address in this form:
"Heinrich Heine (Der Dichter) (heinrichh@duesseldorf\&.de)"
-Real name: amandabackup
+Real name: backup
Email address:
-Comment: gpg keys for amandabackup
+Comment: gpg keys for backup
You selected this USER\-ID:
- "amandabackup (gpg keys for amandabackup)"
+ "backup (gpg keys for backup)"
Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
You need a Passphrase to protect your secret key\&.
public and secret key created and signed\&.
key marked as ultimately trusted\&.
-pub 1024D/4417A8CB 2006\-02\-07 amandabackup (gpg keys for amandabackup)
+pub 1024D/4417A8CB 2006\-02\-07 backup (gpg keys for backup)
Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
sub 1024g/8C3A6A78 2006\-02\-07 [expires: 2006\-08\-06]
.fi
.\" Title: amserverconfig
.\" Author: Kevin Till <kevin.till@zmanda.com>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: System Administration Commands
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "AMSERVERCONFIG" "8" "07/25/2012" "Amanda 3\&.3\&.2" "System Administration Commands"
+ .TH "AMSERVERCONFIG" "8" "01/10/2013" "Amanda 3\&.3\&.3" "System Administration Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
\fBamserverconfig\fR
does not change existing Amanda configurations\&.
\fBamserverconfig\fR
-must be run by user amandabackup\&.
+must be run by user backup\&.
.SH "OPTIONS"
.PP
Options may be abbreviated, as long as the abbreviation is not ambiguous\&. Option argument can either separated by \*(Aq=\*(Aq or a space\&. Example: \-\-templ=harddisk \-\-tapedev /dev/nst0
.sp
If tape\-changer is chosen for this option, program mtx is required\&.
\fBamserverconfig\fR
-will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and amandabackup\*(Aqs PATH\&.
+will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and backup\*(Aqs PATH\&.
.sp
If harddisk is chosen and \-\-no\-vtape is not specified,
\fBamserverconfig\fR
.PP
\fB\-\-mailto mailto\fR
.RS 4
-A space separated list of recipients for mail reports\&. default [amandabackup]
+A space separated list of recipients for mail reports\&. default [backup]
.RE
.PP
\fB\-\-dumpcycle dumpcycle\fR
.PP
\fB/var/lib/amanda\fR
.RS 4
-amandabackup home directory
+backup home directory
.RE
.PP
\fB/var/lib/amanda/gnutar\-lists\fR
.\" Title: amsuntar
.\" Author: Satya Ganga <gast@zmanda.com>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: System Administration Commands
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "AMSUNTAR" "8" "07/25/2012" "Amanda 3\&.3\&.2" "System Administration Commands"
+ .TH "AMSUNTAR" "8" "01/10/2013" "Amanda 3\&.3\&.3" "System Administration Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
\fBdiskdevice\fR
in the disklist (DLE) must be the directory to backup\&.
.PP
-Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like amandabackup, amandabackup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" amandabackup\*(Aq command\&.
+Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like backup, backup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" backup\*(Aq command\&.
.SH "PROPERTIES"
.PP
This section lists the properties that control amsuntar\*(Aqs functionality\&. See
.\" Title: disklist
.\" Author: James da Silva <jds@amanda.org>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
- .\" Date: 07/25/2012
+ .\" Date: 01/10/2013
.\" Manual: File formats and conventions
- .\" Source: Amanda 3.3.2
+ .\" Source: Amanda 3.3.3
.\" Language: English
.\"
- .TH "DISKLIST" "5" "07/25/2012" "Amanda 3\&.3\&.2" "File formats and conventions"
+ .TH "DISKLIST" "5" "01/10/2013" "Amanda 3\&.3\&.3" "File formats and conventions"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
\fBamanda\&.conf\fR
file\&.
\fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in
-/etc/dumpdates, the disk\*(Aqs relative priority, etc\&.
+/var/lib/dumpdates, the disk\*(Aqs relative priority, etc\&.
.RE
.PP
\fIspindle\fR
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><amkeyword>report-use-media</amkeyword> <amtype>boolean</amtype></term>
+ <listitem>
+ <para>Default:
+ <amdefault>True</amdefault> if <amkeyword>max-dle-by-volume</amkeyword>
+ is not set,
+ <amdefault>False</amdefault> if it is set.
+ If the reporter must print the list of media used in the run.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><amkeyword>report-next-media</amkeyword> <amtype>boolean</amtype></term>
+ <listitem>
+ <para>Default:
+ <amdefault>True</amdefault> if <amkeyword>max-dle-by-volume</amkeyword>
+ is not set,
+ <amdefault>False</amdefault> if it is set.
+ If the reporter must print the list of media expected for the next run.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><amkeyword>max-dle-by-volume</amkeyword> <amtype>int</amtype></term>
<listitem>
<term><amkeyword>record</amkeyword> <amtype>boolean</amtype></term>
<listitem>
<para>Default:
-<amkeyword>yes</amkeyword>.
-Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
+<emphasis remap='I'>yes</emphasis>.
+Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>
for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
This is normally enabled for daily backups and turned off for periodic archival runs.</para>
</listitem>
<varlistentry>
<term><amkeyword>part-size</amkeyword> <amtype>int</amtype></term>
<listitem>
- <para>Default: none. This is the size (in KB if no units are specified) of
- each split part written to the volume. It is reduced to
- <amkeyword>part-cache-max-size</amkeyword> when part caching is required.
- If this is set to zero, then no splitting will take place; in this case,
- some devices can span dumps from volume to volume, while others will cause
- the entire dump to fail if they encounter end-of-medium before the dump is
- complete. See "Dump Splitting Configuration" below.</para>
+ <para>If this is set to zero (default), then no splitting will take place,
+ and the entire dump will fail, if end-of-medium is encountered before
+ the dump is complete, unless the device property LEOM is true, and the
+ device can detect EOM. See "Dump Splitting Configuration" below.</para>
</listitem>
</varlistentry>
#
# Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
#
- # This program is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License version 2 as published
- # by the Free Software Foundation.
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
my $confdir="$CONFIG_DIR";
my $tmpdir="$AMANDA_DBGDIR";
-my $amandahomedir="$localstatedir/lib/amanda";
+my $amandahomedir="$localstatedir/amanda";
my $templatedir="$amdatadir/template.d"; #rpm install template files here
my $def_tapedev="file:$amandahomedir/vtapes";
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
char *clnt_decrypt_opt; /* client-side decryption option parameter to use */
double comprate[2]; /* default compression rates */
/* flag options */
- int record; /* record dump in /etc/dumpdates ? */
+ int record; /* record dump in /var/lib/dumpdates ? */
int skip_incr; /* incs done externally ? */
int skip_full; /* fulls done externally ? */
int to_holdingdisk; /* use holding disk ? */
*/
void disable_skip_disk(disklist_t *origqp);
- char *match_disklist(disklist_t *origqp, int sargc, char **sargv);
- gboolean match_dumpfile(dumpfile_t *file, int sargc, char **sargv);
+ char *match_disklist(disklist_t *origqp, gboolean exact_match, int sargc,
+ char **sargv);
+ gboolean match_dumpfile(dumpfile_t *file, gboolean exact_match, int sargc,
+ char **sargv);
void free_disklist(disklist_t *dl);
netif_t *disklist_netifs(void);