1 diff -Nru coda-5.3.20.orig/coda-src/al/altest.c coda-5.3.20/coda-src/al/altest.c
2 --- coda-5.3.20.orig/coda-src/al/altest.c Fri Jan 25 00:35:46 2002
3 +++ coda-5.3.20/coda-src/al/altest.c Fri Feb 7 11:03:40 2003
5 /* Load configuration file to get vice dir. */
6 codaconf_init("server.conf");
8 - CONF_STR(vicedir, "vicedir", "/vice");
9 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
11 vice_dir_init(vicedir, 0);
13 diff -Nru coda-5.3.20.orig/coda-src/al/pdbtool.c coda-5.3.20/coda-src/al/pdbtool.c
14 --- coda-5.3.20.orig/coda-src/al/pdbtool.c Fri Jan 25 00:35:48 2002
15 +++ coda-5.3.20/coda-src/al/pdbtool.c Fri Feb 7 11:02:58 2003
17 /* Load server.conf configuration file to get vice dir. */
18 codaconf_init("server.conf");
20 - CONF_STR(vicedir, "vicedir", "/vice");
21 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
23 vice_dir_init(vicedir, 0);
25 diff -Nru coda-5.3.20.orig/coda-src/auth2/auth2.c coda-5.3.20/coda-src/auth2/auth2.c
26 --- coda-5.3.20.orig/coda-src/auth2/auth2.c Thu Mar 14 22:23:39 2002
27 +++ coda-5.3.20/coda-src/auth2/auth2.c Fri Feb 7 11:07:12 2003
29 /* Load configuration file to get vice dir. */
30 codaconf_init("server.conf");
32 - CONF_STR(vicedir, "vicedir", "/vice");
33 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
35 vice_dir_init(vicedir, 0);
37 diff -Nru coda-5.3.20.orig/coda-src/norton/norton-reinit.cc coda-5.3.20/coda-src/norton/norton-reinit.cc
38 --- coda-5.3.20.orig/coda-src/norton/norton-reinit.cc Fri May 25 13:48:03 2001
39 +++ coda-5.3.20/coda-src/norton/norton-reinit.cc Fri Feb 7 11:16:57 2003
41 data_len = atoi(argv[4]);
44 - vice_dir_init("/vice", 0);
45 + vice_dir_init("/var/lib/vice", 0);
48 if (strcmp(argv[7], "skip")) {
49 diff -Nru coda-5.3.20.orig/coda-src/norton/norton.cc coda-5.3.20/coda-src/norton/norton.cc
50 --- coda-5.3.20.orig/coda-src/norton/norton.cc Fri May 25 13:48:03 2001
51 +++ coda-5.3.20/coda-src/norton/norton.cc Fri Feb 7 11:17:12 2003
56 - vice_dir_init("/vice", ServerNumber);
57 + vice_dir_init("/var/lib/vice", ServerNumber);
58 NortonInit(argv[0], argv[1], atoi(argv[2]));
61 diff -Nru coda-5.3.20.orig/coda-src/portmapper/rpc2portmap.c coda-5.3.20/coda-src/portmapper/rpc2portmap.c
62 --- coda-5.3.20.orig/coda-src/portmapper/rpc2portmap.c Fri Jan 25 00:35:50 2002
63 +++ coda-5.3.20/coda-src/portmapper/rpc2portmap.c Fri Feb 7 11:12:36 2003
65 /* Load configuration file to get vice dir. */
66 codaconf_init("server.conf");
68 - CONF_STR(vicedir, "vicedir", "/vice");
69 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
71 vice_dir_init(vicedir, 0);
73 diff -Nru coda-5.3.20.orig/coda-src/scripts/bldvldb.sh.in coda-5.3.20/coda-src/scripts/bldvldb.sh.in
74 --- coda-5.3.20.orig/coda-src/scripts/bldvldb.sh.in Thu May 18 23:54:39 2000
75 +++ coda-5.3.20/coda-src/scripts/bldvldb.sh.in Fri Feb 7 11:11:13 2003
79 if [ x${vicedir} = x ] ; then
81 + vicedir=/var/lib/vice
84 THISHOST=`hostname | tr A-Z a-z`
85 diff -Nru coda-5.3.20.orig/coda-src/scripts/createvol_rep.in coda-5.3.20/coda-src/scripts/createvol_rep.in
86 --- coda-5.3.20.orig/coda-src/scripts/createvol_rep.in Mon May 13 21:55:19 2002
87 +++ coda-5.3.20/coda-src/scripts/createvol_rep.in Fri Feb 7 11:10:43 2003
91 # load the server configuration file
93 +vicedir=/var/lib/vice
94 . "`codaconfedit server.conf`"
96 if [ ! -f ${vicedir}/hostname -o ! -f ${vicedir}/db/scm ] ; then
97 diff -Nru coda-5.3.20.orig/coda-src/scripts/rc.vice.in coda-5.3.20/coda-src/scripts/rc.vice.in
98 --- coda-5.3.20.orig/coda-src/scripts/rc.vice.in Wed Apr 11 15:08:01 2001
99 +++ coda-5.3.20/coda-src/scripts/rc.vice.in Fri Feb 7 11:08:48 2003
103 if [ x${vicedir} = x ]; then
105 + vicedir=/var/lib/vice
108 if [ x${numservers} = x ]; then
109 diff -Nru coda-5.3.20.orig/coda-src/scripts/startserver.in coda-5.3.20/coda-src/scripts/startserver.in
110 --- coda-5.3.20.orig/coda-src/scripts/startserver.in Thu May 17 23:26:46 2001
111 +++ coda-5.3.20/coda-src/scripts/startserver.in Fri Feb 7 11:09:19 2003
115 if [ x${vicedir} = x ]; then
117 + vicedir=/var/lib/vice
120 if [ -f ${vicedir}/srv/pid ]; then
121 diff -Nru coda-5.3.20.orig/coda-src/scripts/vice-setup-rvm.in coda-5.3.20/coda-src/scripts/vice-setup-rvm.in
122 --- coda-5.3.20.orig/coda-src/scripts/vice-setup-rvm.in Tue Feb 26 23:31:34 2002
123 +++ coda-5.3.20/coda-src/scripts/vice-setup-rvm.in Fri Feb 7 11:11:33 2003
127 # defaults, will be overridden by settings in the server.conf file
129 +vicedir=/var/lib/vice
131 conf="`codaconfedit server.conf`"
132 if [ "x${conf}" != x/dev/null ] ; then
133 diff -Nru coda-5.3.20.orig/coda-src/scripts/vice-setup-scm coda-5.3.20/coda-src/scripts/vice-setup-scm
134 --- coda-5.3.20.orig/coda-src/scripts/vice-setup-scm Tue Feb 26 23:36:11 2002
135 +++ coda-5.3.20/coda-src/scripts/vice-setup-scm Fri Feb 7 11:08:21 2003
137 . "`codaconfedit server.conf`"
139 if [ x${vicedir} = x ] ; then
141 + vicedir=/var/lib/vice
144 # current first maximum replicated volume id
145 diff -Nru coda-5.3.20.orig/coda-src/scripts/vice-setup-srvdir coda-5.3.20/coda-src/scripts/vice-setup-srvdir
146 --- coda-5.3.20.orig/coda-src/scripts/vice-setup-srvdir Tue Mar 12 20:57:09 2002
147 +++ coda-5.3.20/coda-src/scripts/vice-setup-srvdir Fri Feb 7 12:48:19 2003
153 +vicedir=/var/lib/vice
155 . "`codaconfedit server.conf`"
160 if [ $numservers -gt 1 ]; then
161 - echon "Where shall we store your file data for server $n ($bn) [/vicepa]? "
162 + echon "Where shall we store your file data for server $n ($bn) [/var/lib/vicepa]? "
164 - echon 'Where shall we store your file data [/vicepa]? '
165 + echon 'Where shall we store your file data [/var/lib/vicepa]? '
170 if [ "x$srvdir" = x ]; then
172 + srvdir=/var/lib/vicepa
175 # Create the directory if needed. (Symlink is OK.)
176 diff -Nru coda-5.3.20.orig/coda-src/scripts/vice-setup-user coda-5.3.20/coda-src/scripts/vice-setup-user
177 --- coda-5.3.20.orig/coda-src/scripts/vice-setup-user Tue Feb 26 23:36:12 2002
178 +++ coda-5.3.20/coda-src/scripts/vice-setup-user Fri Feb 7 11:10:19 2003
184 +vicedir=/var/lib/vice
185 . "`codaconfedit server.conf`"
187 # Set up password and group files for Coda
188 diff -Nru coda-5.3.20.orig/coda-src/scripts/vice-setup.in coda-5.3.20/coda-src/scripts/vice-setup.in
189 --- coda-5.3.20.orig/coda-src/scripts/vice-setup.in Tue Mar 12 21:23:30 2002
190 +++ coda-5.3.20/coda-src/scripts/vice-setup.in Fri Feb 7 12:46:14 2003
191 @@ -106,12 +106,12 @@
195 -echon "What is the root directory for your coda server(s)? [/vice] "
196 +echon "What is the root directory for your coda server(s)? [/var/lib/vice] "
200 if [ "x$vicedir" = x ] ; then
202 + vicedir=/var/lib/vice
205 if [ $mkconf = 1 ] ; then
206 diff -Nru coda-5.3.20.orig/coda-src/update/updateclnt.cc coda-5.3.20/coda-src/update/updateclnt.cc
207 --- coda-5.3.20.orig/coda-src/update/updateclnt.cc Tue Oct 15 18:47:55 2002
208 +++ coda-5.3.20/coda-src/update/updateclnt.cc Fri Feb 7 11:13:09 2003
210 /* Load configuration file to get vice dir. */
211 codaconf_init("server.conf");
213 - CONF_STR(vicedir, "vicedir", "/vice");
214 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
215 CONF_INT(nservers, "numservers", 1);
217 vice_dir_init(vicedir, 0);
218 diff -Nru coda-5.3.20.orig/coda-src/update/updatefetch.cc coda-5.3.20/coda-src/update/updatefetch.cc
219 --- coda-5.3.20.orig/coda-src/update/updatefetch.cc Fri Jan 25 00:35:51 2002
220 +++ coda-5.3.20/coda-src/update/updatefetch.cc Fri Feb 7 11:13:52 2003
222 /* Load configuration file to get vice dir. */
223 codaconf_init("server.conf");
225 - CONF_STR(vicedir, "vicedir", "/vice");
226 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
227 CONF_INT(nservers, "numservers", 1);
229 vice_dir_init(vicedir, 0);
230 diff -Nru coda-5.3.20.orig/coda-src/update/updatesrv.cc coda-5.3.20/coda-src/update/updatesrv.cc
231 --- coda-5.3.20.orig/coda-src/update/updatesrv.cc Tue Oct 15 18:47:55 2002
232 +++ coda-5.3.20/coda-src/update/updatesrv.cc Fri Feb 7 11:13:29 2003
234 /* Load configuration file to get vice dir. */
235 codaconf_init("server.conf");
237 - CONF_STR(vicedir, "vicedir", "/vice");
238 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
240 vice_dir_init(vicedir, 0);
242 diff -Nru coda-5.3.20.orig/coda-src/vice/printvrdb.cc coda-5.3.20/coda-src/vice/printvrdb.cc
243 --- coda-5.3.20.orig/coda-src/vice/printvrdb.cc Fri Jan 25 00:35:52 2002
244 +++ coda-5.3.20/coda-src/vice/printvrdb.cc Fri Feb 7 11:06:10 2003
246 /* Load configuration file to get vice dir. */
247 codaconf_init("server.conf");
249 - CONF_STR(vicedir, "vicedir", "/vice");
250 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
252 vice_dir_init(vicedir, 0);
254 diff -Nru coda-5.3.20.orig/coda-src/vice/server.conf.ex coda-5.3.20/coda-src/vice/server.conf.ex
255 --- coda-5.3.20.orig/coda-src/vice/server.conf.ex Fri Mar 15 18:35:22 2002
256 +++ coda-5.3.20/coda-src/vice/server.conf.ex Fri Feb 7 11:05:44 2003
259 # Prefix of server tree
262 +#vicedir=/var/lib/vice
265 # Should the server use private mmaps for RVM
266 diff -Nru coda-5.3.20.orig/coda-src/vice/srv.cc coda-5.3.20/coda-src/vice/srv.cc
267 --- coda-5.3.20.orig/coda-src/vice/srv.cc Tue May 21 05:36:30 2002
268 +++ coda-5.3.20/coda-src/vice/srv.cc Fri Feb 7 11:06:38 2003
269 @@ -1346,7 +1346,7 @@
270 CONF_INT(large, "large", 500);
271 CONF_INT(small, "small", 500);
273 - CONF_STR(vicedir, "vicedir", "/vice");
274 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
275 vice_dir_init(vicedir, ServerNumber);
277 CONF_INT(trace, "trace", 0);
278 diff -Nru coda-5.3.20.orig/coda-src/vol/testvrdb.cc coda-5.3.20/coda-src/vol/testvrdb.cc
279 --- coda-5.3.20.orig/coda-src/vol/testvrdb.cc Fri Jan 12 12:58:31 2001
280 +++ coda-5.3.20/coda-src/vol/testvrdb.cc Fri Feb 7 11:05:03 2003
282 sprintf (confname, "%s.conf", serverconf);
283 (void) conf_init(confname);
285 - CONF_STR(vicedir, "vicedir", "/vice");
286 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
288 vice_dir_init(vicedir, 0);
290 diff -Nru coda-5.3.20.orig/coda-src/volutil/backup.cc coda-5.3.20/coda-src/volutil/backup.cc
291 --- coda-5.3.20.orig/coda-src/volutil/backup.cc Fri Jan 25 00:35:54 2002
292 +++ coda-5.3.20/coda-src/volutil/backup.cc Fri Feb 7 11:14:49 2003
294 /* Load configuration file to get vice dir. */
295 codaconf_init("server.conf");
297 - CONF_STR(vicedir, "vicedir", "/vice");
298 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
300 vice_dir_init(vicedir, 0);
302 diff -Nru coda-5.3.20.orig/coda-src/volutil/volclient.cc coda-5.3.20/coda-src/volutil/volclient.cc
303 --- coda-5.3.20.orig/coda-src/volutil/volclient.cc Fri Jan 25 00:35:54 2002
304 +++ coda-5.3.20/coda-src/volutil/volclient.cc Fri Feb 7 11:14:30 2003
306 /* Load configuration file to get vice dir. */
307 codaconf_init("server.conf");
309 - CONF_STR(vicedir, "vicedir", "/vice");
310 + CONF_STR(vicedir, "vicedir", "/var/lib/vice");
311 CONF_INT(nservers, "numservers", 1);
313 vice_dir_init(vicedir, 0);