fix for #693331, amserverconfig trying to create /var/lib/lib/amanda

diff --git a/debian/patches/fix-amserverconfig-path b/debian/patches/fix-amserverconfig-path
new file mode 100644 (file)
index 0000000..e9f3365
--- /dev/null
+++ b/debian/patches/fix-amserverconfig-path
@@ -0,0 +1,13 @@
+diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl
+index a05dd18..9357116 100755
+--- a/server-src/amserverconfig.pl
++++ b/server-src/amserverconfig.pl
+@@ -31,7 +31,7 @@ use Amanda::Constants;
+ 
+ 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";
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 4bd2880124cf079b7c08ba093f6f55d7dac3c2ff..8a8ba3f8c254aac7957231d12fdc882dd3ebc6af 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dumpdates-path
+fix-amserverconfig-path

diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl
index a05dd18b2b124949bda68f3af3e2f1eea3599498..9357116dff1a46fac9631035552975c4399d55b5 100755 (executable)
--- a/server-src/amserverconfig.pl
+++ b/server-src/amserverconfig.pl
@@ -31,7 +31,7 @@ use Amanda::Constants;
 
 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";