#! @PERL@
-# Copyright (c) 2009, 2010 Zmanda Inc. All Rights Reserved.
+# Copyright (c) 2009-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
my $overwrite = 0;
Getopt::Long::Configure(qw{bundling});
GetOptions(
+ 'version' => \&Amanda::Util::version_opt,
'o=s' => sub { add_config_override_opt($config_overrides, $_[1]); },
'w' => \$overwrite,
) or usage();
} elsif ($dev->status & $DEVICE_STATUS_VOLUME_UNLABELED and
$dev->volume_header and
$dev->volume_header->{'type'} == $Amanda::Header::F_WEIRD) {
- print STDERR " contains a non-Amanda volume; check and relabel it with 'amlabel -f'\n";
+ my $autolabel = getconf($CNF_AUTOLABEL);
+ if ($autolabel->{'non_amanda'}) {
+ print STDERR " contains a non-Amanda volume\n";
+ } else {
+ print STDERR " contains a non-Amanda volume; check and relabel it with 'amlabel -f'\n";
+ }
} elsif ($dev->status & $DEVICE_STATUS_VOLUME_ERROR) {
my $message = $dev->error_or_status();
print STDERR " Can't read label: $message\n";
step result_cb => sub {
(my $err, $res, $label, $mode) = @_;
- return failure($err, $finished_cb) if $err;
+ if ($err) {
+ if ($res) {
+ $res->release(finished_cb => sub {
+ return failure($err, $finished_cb);
+ });
+ return;
+ } else {
+ return failure($err, $finished_cb);
+ }
+ }
my $modestr = ($mode == $ACCESS_APPEND)? "append" : "write";
my $slot = $res->{'this_slot'};
- if (defined $res->{'device'}->volume_label()) {
+ if (defined $res->{'device'} and defined $res->{'device'}->volume_label()) {
print "Will $modestr to volume '$label' in slot $slot.\n";
} else {
- print "Will $modestr label '$label' to new volume in slot $slot.\n";
+ my $header = $res->{'device'}->volume_header();
+ if ($header->{'type'} == $Amanda::Header::F_WEIRD) {
+ print "Will $modestr label '$label' to non-Amanda volume in slot $slot.\n";
+ } else {
+ print "Will $modestr label '$label' to new volume in slot $slot.\n";
+ }
}
$steps->{'check_access_type'}->();