]> git.pld-linux.org Git - packages/amanda.git/blame - amanda-FHS.patch
projects / packages / amanda.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
perl 5.38.0 rebuild
[packages/amanda.git] / amanda-FHS.patch
CommitLineData
9564c161
JR		 1diff -urNp -x '*.orig' amanda-3.5.1.org/common-src/conffile.c amanda-3.5.1/common-src/conffile.c
2--- amanda-3.5.1.org/common-src/conffile.c 2017-12-01 14:26:28.000000000 +0100
3+++ amanda-3.5.1/common-src/conffile.c 2021-05-08 10:23:13.673469863 +0200
4@@ -6422,9 +6422,9 @@ init_defaults(
5 conf_init_str(&conf_data[CNF_CHANGERFILE] , "changer");
4b51c379
JR		 6 conf_init_str (&conf_data[CNF_TAPELIST] , "tapelist");
7 conf_init_str (&conf_data[CNF_DISKFILE] , "disklist");
8- conf_init_str (&conf_data[CNF_INFOFILE] , "/usr/adm/amanda/curinfo");
9- conf_init_str (&conf_data[CNF_LOGDIR] , "/usr/adm/amanda");
10- conf_init_str (&conf_data[CNF_INDEXDIR] , "/usr/adm/amanda/index");
11+ conf_init_str (&conf_data[CNF_INFOFILE] , "/var/lib/amanda/curinfo");
12+ conf_init_str (&conf_data[CNF_LOGDIR] , "/var/lib/amanda");
13+ conf_init_str (&conf_data[CNF_INDEXDIR] , "/var/lib/amanda/index");
b2a21571
JR		 14 conf_init_ident (&conf_data[CNF_TAPETYPE] , "DEFAULT_TAPE");
15 conf_init_identlist(&conf_data[CNF_HOLDINGDISK] , NULL);
9564c161
JR		 16 conf_init_int (&conf_data[CNF_DUMPCYCLE] , CONF_UNIT_NONE, 10);
17diff -urNp -x '*.orig' amanda-3.5.1.org/example/amanda.conf.in amanda-3.5.1/example/amanda.conf.in
18--- amanda-3.5.1.org/example/amanda.conf.in 2017-12-01 14:26:34.000000000 +0100
19+++ amanda-3.5.1/example/amanda.conf.in 2021-05-08 10:23:13.673469863 +0200
20@@ -215,9 +215,9 @@ holdingdisk hd1 {
4b51c379
JR		 21 # Note that, although the keyword below is infofile, it is only so for
22 # historic reasons, since now it is supposed to be a directory (unless
23 # you have selected some database format other than the `text' default)
24-infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
25-logdir "@CONFIG_DIR@/@DEFAULT_CONFIG@" # log directory
26-indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index" # index directory
27+infofile "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
28+logdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@" # log directory
29+indexdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/index" # index directory
30 #tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
31 # tapelist is stored, by default, in the directory that contains amanda.conf
32
9564c161
JR		 33diff -urNp -x '*.orig' amanda-3.5.1.org/example/template.d/advanced.conf.in amanda-3.5.1/example/template.d/advanced.conf.in
34--- amanda-3.5.1.org/example/template.d/advanced.conf.in 2017-12-01 14:26:34.000000000 +0100
35+++ amanda-3.5.1/example/template.d/advanced.conf.in 2021-05-08 10:23:13.673469863 +0200
36@@ -84,10 +84,10 @@ autoflush no
4b51c379
JR		 37 # Note that, although the keyword below is infofile, it is only so for
38 # historic reasons, since now it is supposed to be a directory (unless
39 # you have selected some database format other than the `text' default)
40-infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
41-logdir "@CONFIG_DIR@/@DEFAULT_CONFIG@" # log directory
42-indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index" # index directory
43-#tapelist "@CONFIG_DIR/DailySet1/tapelist" # list of used tapes
44+infofile "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
45+logdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@" # log directory
46+indexdir "@localstatedir@/lib/amanda/@DEFAULT_CONFIG@/index" # index directory
47+#tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
48 # tapelist is stored, by default, in the directory that contains amanda.conf
49
50 # Specify holding disks. These are used as a temporary staging area for
9564c161
JR		 51diff -urNp -x '*.orig' amanda-3.5.1.org/server-src/amserverconfig.pl amanda-3.5.1/server-src/amserverconfig.pl
52--- amanda-3.5.1.org/server-src/amserverconfig.pl 2017-12-01 14:26:29.000000000 +0100
53+++ amanda-3.5.1/server-src/amserverconfig.pl 2021-05-08 10:23:13.673469863 +0200
54@@ -96,16 +96,16 @@ sub log_and_die {
4b51c379
JR		 55 unlink "$confdir/$config/tapelist" ||
56 print LOG "unlink $confdir/$config/tapelist failed: $!\n";
57 }
58- if ( -e "$confdir/$config/curinfo" ) {
59- rmdir "$confdir/$config/curinfo" ||
60- print LOG "rmdir $confdir/$config failed: $!\n";
4b51c379
JR		 61+ if ( -e "$localstatedir/lib/amanda/$config/curinfo" ) {
62+ rmdir "$localstatedir/lib/amanda/$config/curinfo" ||
63+ print LOG "rmdir $localstatedir/lib/amanda/$config/curinfo failed: $!\n";
9564c161
JR		 64 }
65- if ( -e "$confdir/$config/index" ) {
66- rmdir "$confdir/$config/index" ||
67- print LOG "rmdir $confdir/$config/index failed: $!\n";
4b51c379
JR		 68+ if ( -e "$localstatedir/lib/amanda/$config/index" ) {
69+ rmdir "$localstatedir/lib/amanda/$config/index" ||
70+ print LOG "rmdir $localstatedir/lib/amanda/$config/index failed: $!\n";
71 }
72 rmdir "$confdir/$config" ||
73- print LOG "rmdir $confdir/$config failed: $!\n";
74+ print LOG "rmdir $localstatedir/lib/amanda/$config failed: $!\n";
75 }
76 die $err;
77 }
9564c161 78@@ -159,10 +159,12 @@ sub copy_template_file {
4b51c379
JR		 79
80
81 sub create_curinfo_index_dir {
b2a21571
JR		 82- mkpath("$confdir/$config/curinfo", $def_perm) ||
83- &log_and_die ("ERROR: mkpath: $confdir/$config/curinfo failed: $!\n", 1);
84- mkpath("$confdir/$config/index", $def_perm) ||
85- &log_and_die ("ERROR: mkpath: $confdir/$config/index failed: $!\n", 1);
86+ mkpath("$localstatedir/lib/amanda/$config", $def_perm) ||
87+ &log_and_die ("ERROR: mkpath: $localstatedir/lib/amanda/$config failed: $!\n", 1);
88+ mkpath("$localstatedir/lib/amanda/$config/curinfo", $def_perm) ||
89+ &log_and_die ("ERROR: mkpath: $localstatedir/lib/amanda/$config/curinfo failed: $!\n", 1);
90+ mkpath("$localstatedir/lib/amanda/$config/index", $def_perm) ||
91+ &log_and_die ("ERROR: mkpath: $localstatedir/lib/amanda/$config/index failed: $!\n", 1);
4b51c379
JR		 92 &mprint ("curinfo and index directory created\n");
93 }
94
A network-capable tape backup solution
This page took 0.076781 seconds and 4 git commands to generate.