coda-FHS.patch

   1 Only in coda-6.0.5-new/autom4te.cache: output.1t
   2 Only in coda-6.0.5-new/autom4te.cache: traces.1t
   3 diff -ur coda-6.0.5/coda-src/al/altest.c coda-6.0.5-new/coda-src/al/altest.c
   4 --- coda-6.0.5/coda-src/al/altest.c     2003-11-21 14:49:52.000000000 -0700
   5 +++ coda-6.0.5-new/coda-src/al/altest.c 2004-04-02 23:43:00.542847046 -0700
   6 @@ -101,7 +101,7 @@
   7      /* Load configuration file to get vice dir. */
   8      codaconf_init("server.conf");
   9
  10 -    CODACONF_STR(vicedir, "vicedir", "/vice");
  11 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
  12
  13      vice_dir_init(vicedir, 0);
  14  }
  15 Only in coda-6.0.5-new/coda-src/al: altest.c~
  16 Only in coda-6.0.5-new/coda-src/al: altest.c.orig
  17 diff -ur coda-6.0.5/coda-src/al/pdbtool.c coda-6.0.5-new/coda-src/al/pdbtool.c
  18 --- coda-6.0.5/coda-src/al/pdbtool.c    2004-03-05 14:17:25.000000000 -0700
  19 +++ coda-6.0.5-new/coda-src/al/pdbtool.c        2004-04-02 23:43:24.657481001 -0700
  20 @@ -836,7 +836,7 @@
  21      /* Load server.conf configuration file to get vice dir. */
  22      codaconf_init("server.conf");
  23
  24 -    CODACONF_STR(vicedir, "vicedir", "/vice");
  25 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
  26
  27      vice_dir_init(vicedir, 0);
  28  }
  29 Only in coda-6.0.5-new/coda-src/al: pdbtool.c~
  30 Only in coda-6.0.5-new/coda-src/al: pdbtool.c.orig
  31 diff -ur coda-6.0.5/coda-src/auth2/auth2.c coda-6.0.5-new/coda-src/auth2/auth2.c
  32 --- coda-6.0.5/coda-src/auth2/auth2.c   2003-11-21 14:49:55.000000000 -0700
  33 +++ coda-6.0.5-new/coda-src/auth2/auth2.c       2004-04-02 23:43:43.832804410 -0700
  34 @@ -122,7 +122,7 @@
  35      /* Load configuration file to get vice dir. */
  36      codaconf_init("server.conf");
  37
  38 -    CODACONF_STR(vicedir, "vicedir", "/vice");
  39 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
  40
  41      vice_dir_init(vicedir, 0);
  42  }
  43 Only in coda-6.0.5-new/coda-src/auth2: auth2.c~
  44 Only in coda-6.0.5-new/coda-src/auth2: auth2.c.orig
  45 diff -ur coda-6.0.5/coda-src/norton/norton.cc coda-6.0.5-new/coda-src/norton/norton.cc
  46 --- coda-6.0.5/coda-src/norton/norton.cc        2003-05-23 12:26:36.000000000 -0600
  47 +++ coda-6.0.5-new/coda-src/norton/norton.cc    2004-04-02 23:42:19.786536022 -0700
  48 @@ -63,7 +63,7 @@
  49         exit(1);
  50      }
  51
  52 -    vice_dir_init("/vice", ServerNumber);
  53 +    vice_dir_init("/var/lib/coda/vice", ServerNumber);
  54      NortonInit(argv[0], argv[1], atoi(argv[2]));
  55
  56      InitParsing();
  57 Only in coda-6.0.5-new/coda-src/norton: norton.cc.orig
  58 diff -ur coda-6.0.5/coda-src/norton/norton-reinit.cc coda-6.0.5-new/coda-src/norton/norton-reinit.cc
  59 --- coda-6.0.5/coda-src/norton/norton-reinit.cc 2003-07-23 15:41:20.000000000 -0600
  60 +++ coda-6.0.5-new/coda-src/norton/norton-reinit.cc     2004-04-02 23:42:19.785536161 -0700
  61 @@ -909,7 +909,7 @@
  62         data_len = atoi(argv[4]);
  63      }
  64
  65 -    vice_dir_init("/vice", 0);
  66 +    vice_dir_init("/var/lib/coda/vice", 0);
  67
  68      if (argc > 8) {
  69         if (strcmp(argv[7], "skip")) {
  70 diff -ur coda-6.0.5/coda-src/portmapper/rpc2portmap.c coda-6.0.5-new/coda-src/portmapper/rpc2portmap.c
  71 --- coda-6.0.5/coda-src/portmapper/rpc2portmap.c        2003-11-21 14:49:56.000000000 -0700
  72 +++ coda-6.0.5-new/coda-src/portmapper/rpc2portmap.c    2004-04-02 23:44:04.617903119 -0700
  73 @@ -74,7 +74,7 @@
  74      /* Load configuration file to get vice dir. */
  75      codaconf_init("server.conf");
  76
  77 -    CODACONF_STR(vicedir, "vicedir", "/vice");
  78 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
  79
  80      vice_dir_init(vicedir, 0);
  81  }
  82 Only in coda-6.0.5-new/coda-src/portmapper: rpc2portmap.c~
  83 Only in coda-6.0.5-new/coda-src/portmapper: rpc2portmap.c.orig
  84 diff -ur coda-6.0.5/coda-src/scripts/bldvldb.sh.in coda-6.0.5-new/coda-src/scripts/bldvldb.sh.in
  85 --- coda-6.0.5/coda-src/scripts/bldvldb.sh.in   2004-03-05 14:12:44.000000000 -0700
  86 +++ coda-6.0.5-new/coda-src/scripts/bldvldb.sh.in       2004-04-02 23:42:19.949513273 -0700
  87 @@ -28,7 +28,7 @@
  88  fi
  89
  90  if [ x${vicedir} = x ] ; then
  91 -  vicedir=/vice
  92 +  vicedir=/var/lib/coda/vice
  93  fi
  94
  95  THISHOST=`hostname | tr A-Z a-z`
  96 Only in coda-6.0.5-new/coda-src/scripts: bldvldb.sh.in.orig
  97 diff -ur coda-6.0.5/coda-src/scripts/createvol_rep.in coda-6.0.5-new/coda-src/scripts/createvol_rep.in
  98 --- coda-6.0.5/coda-src/scripts/createvol_rep.in        2004-03-05 14:12:44.000000000 -0700
  99 +++ coda-6.0.5-new/coda-src/scripts/createvol_rep.in    2004-04-02 23:44:24.760091569 -0700
 100 @@ -32,7 +32,7 @@
 101  export PATH
 102
 103  # load the server configuration file
 104 -vicedir=/vice
 105 +vicedir=/var/lib/coda/vice
 106  . "`@sbindir@/codaconfedit server.conf`"
 107
 108  if [ ! -f ${vicedir}/hostname -o ! -f ${vicedir}/db/scm ] ; then
 109 Only in coda-6.0.5-new/coda-src/scripts: createvol_rep.in~
 110 Only in coda-6.0.5-new/coda-src/scripts: createvol_rep.in.orig
 111 diff -ur coda-6.0.5/coda-src/scripts/rc.vice.in coda-6.0.5-new/coda-src/scripts/rc.vice.in
 112 --- coda-6.0.5/coda-src/scripts/rc.vice.in      2001-04-11 07:08:01.000000000 -0600
 113 +++ coda-6.0.5-new/coda-src/scripts/rc.vice.in  2004-04-02 23:42:20.010504759 -0700
 114 @@ -15,7 +15,7 @@
 115  fi
 116
 117  if [ x${vicedir} = x ]; then
 118 -    vicedir=/vice
 119 +    vicedir=/var/lib/coda/vice
 120  fi
 121
 122  if [ x${numservers} = x ]; then
 123 diff -ur coda-6.0.5/coda-src/scripts/startserver.in coda-6.0.5-new/coda-src/scripts/startserver.in
 124 --- coda-6.0.5/coda-src/scripts/startserver.in  2003-06-01 17:12:56.000000000 -0600
 125 +++ coda-6.0.5-new/coda-src/scripts/startserver.in      2004-04-02 23:42:20.011504620 -0700
 126 @@ -30,7 +30,7 @@
 127  fi
 128
 129  if [ x${vicedir} = x ]; then
 130 -  vicedir=/vice
 131 +  vicedir=/var/lib/coda/vice
 132  fi
 133
 134  if [ -f ${vicedir}/srv/pid ]; then
 135 Only in coda-6.0.5-new/coda-src/scripts: startserver.in.orig
 136 diff -ur coda-6.0.5/coda-src/scripts/vice-setup.in coda-6.0.5-new/coda-src/scripts/vice-setup.in
 137 --- coda-6.0.5/coda-src/scripts/vice-setup.in   2004-03-05 14:12:44.000000000 -0700
 138 +++ coda-6.0.5-new/coda-src/scripts/vice-setup.in       2004-04-02 23:42:20.106491361 -0700
 139 @@ -109,12 +109,12 @@
 140    fi
 141  fi
 142
 143 -echon "What is the root directory for your coda server(s)? [/vice] "
 144 +echon "What is the root directory for your coda server(s)? [/var/lib/coda/vice] "
 145  vicedir=""
 146  read vicedir
 147
 148  if [ "x$vicedir" = x ] ; then
 149 -   vicedir=/vice
 150 +   vicedir=/var/lib/coda/vice
 151  fi
 152
 153  if [ $mkconf = 1 ] ; then
 154 Only in coda-6.0.5-new/coda-src/scripts: vice-setup.in.orig
 155 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-rvm.in coda-6.0.5-new/coda-src/scripts/vice-setup-rvm.in
 156 --- coda-6.0.5/coda-src/scripts/vice-setup-rvm.in       2004-03-05 14:12:44.000000000 -0700
 157 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-rvm.in   2004-04-02 23:42:20.042500293 -0700
 158 @@ -42,7 +42,7 @@
 159  #
 160
 161  # defaults, will be overridden by settings in the server.conf file
 162 -vicedir=/vice
 163 +vicedir=/var/lib/coda/vice
 164
 165  exec_prefix=@exec_prefix@
 166  conf="`@sbindir@/codaconfedit server.conf`"
 167 Only in coda-6.0.5-new/coda-src/scripts: vice-setup-rvm.in.orig
 168 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-scm coda-6.0.5-new/coda-src/scripts/vice-setup-scm
 169 --- coda-6.0.5/coda-src/scripts/vice-setup-scm  2003-05-23 12:26:52.000000000 -0600
 170 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-scm      2004-04-02 23:42:20.072496106 -0700
 171 @@ -36,7 +36,7 @@
 172  . "`codaconfedit server.conf`"
 173
 174  if [ x${vicedir} = x ] ; then
 175 -  vicedir=/vice
 176 +  vicedir=/var/lib/coda/vice
 177  fi
 178
 179  # current first maximum replicated volume id
 180 diff -ur coda-6.0.10/coda-src/scripts/vice-setup-srvdir.orig coda-6.0.10/coda-src/scripts/vice-setup-srvdir
 181 --- coda-6.0.10/coda-src/scripts/vice-setup-srvdir.orig 2004-09-04 08:03:32.000000000 +0200
 182 +++ coda-6.0.10/coda-src/scripts/vice-setup-srvdir      2005-05-27 04:09:36.000000000 +0200
 183 @@ -28,7 +28,7 @@
 184  #
 185  # Configuration
 186  #
 187 -vicedir=/vice
 188 +vicedir=/var/lib/coda/vice
 189  numservers=1
 190  . "`codaconfedit server.conf`"
 191
 192 @@ -62,15 +62,15 @@
 193      echo
 194
 195      if [ $numservers -gt 1 ]; then
 196 -       echon "Where shall we store your file data for server $n ($hn) [/vicepa]? "
 197 +       echon "Where shall we store your file data for server $n ($hn) [/var/lib/coda/vicepa]? "
 198      else
 199 -       echon 'Where shall we store your file data [/vicepa]? '
 200 +       echon 'Where shall we store your file data [/var/lib/coda/vicepa]? '
 201      fi
 202      srvdir=
 203      read srvdir
 204
 205      if [ "x$srvdir" = x ]; then
 206 -       srvdir=/vicepa
 207 +       srvdir=/var/lib/coda/vicepa
 208      fi
 209
 210      # Create the directory if needed.  (Symlink is OK.)
 211 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-user coda-6.0.5-new/coda-src/scripts/vice-setup-user
 212 --- coda-6.0.5/coda-src/scripts/vice-setup-user 2003-05-23 12:26:52.000000000 -0600
 213 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-user     2004-04-02 23:42:20.104491640 -0700
 214 @@ -31,7 +31,7 @@
 215  #
 216  # Configuration
 217  #
 218 -vicedir=/vice
 219 +vicedir=/var/lib/coda/vice
 220  . "`codaconfedit server.conf`"
 221
 222  # Set up password and group files for Coda
 223 diff -ur coda-6.0.5/coda-src/update/updateclnt.cc coda-6.0.5-new/coda-src/update/updateclnt.cc
 224 --- coda-6.0.5/coda-src/update/updateclnt.cc    2003-11-21 14:49:57.000000000 -0700
 225 +++ coda-6.0.5-new/coda-src/update/updateclnt.cc        2004-04-02 23:44:48.664754833 -0700
 226 @@ -335,7 +335,7 @@
 227      /* Load configuration file to get vice dir. */
 228      codaconf_init("server.conf");
 229
 230 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 231 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 232      CODACONF_INT(nservers, "numservers", 1);
 233
 234      vice_dir_init(vicedir, 0);
 235 Only in coda-6.0.5-new/coda-src/update: updateclnt.cc~
 236 Only in coda-6.0.5-new/coda-src/update: updateclnt.cc.orig
 237 diff -ur coda-6.0.5/coda-src/update/updatefetch.cc coda-6.0.5-new/coda-src/update/updatefetch.cc
 238 --- coda-6.0.5/coda-src/update/updatefetch.cc   2003-11-21 14:49:57.000000000 -0700
 239 +++ coda-6.0.5-new/coda-src/update/updatefetch.cc       2004-04-02 23:45:13.171334078 -0700
 240 @@ -89,7 +89,7 @@
 241      /* Load configuration file to get vice dir. */
 242      codaconf_init("server.conf");
 243
 244 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 245 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 246      CODACONF_INT(nservers, "numservers", 1);
 247
 248      vice_dir_init(vicedir, 0);
 249 Only in coda-6.0.5-new/coda-src/update: updatefetch.cc~
 250 Only in coda-6.0.5-new/coda-src/update: updatefetch.cc.orig
 251 diff -ur coda-6.0.5/coda-src/update/updatesrv.cc coda-6.0.5-new/coda-src/update/updatesrv.cc
 252 --- coda-6.0.5/coda-src/update/updatesrv.cc     2003-11-21 14:49:57.000000000 -0700
 253 +++ coda-6.0.5-new/coda-src/update/updatesrv.cc 2004-04-02 23:45:35.348238511 -0700
 254 @@ -120,7 +120,7 @@
 255      /* Load configuration file to get vice dir. */
 256      codaconf_init("server.conf");
 257
 258 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 259 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 260
 261      vice_dir_init(vicedir, 0);
 262  }
 263 Only in coda-6.0.5-new/coda-src/update: updatesrv.cc~
 264 Only in coda-6.0.5-new/coda-src/update: updatesrv.cc.orig
 265 diff -ur coda-6.0.5/coda-src/vice/printvrdb.cc coda-6.0.5-new/coda-src/vice/printvrdb.cc
 266 --- coda-6.0.5/coda-src/vice/printvrdb.cc       2003-11-21 14:49:58.000000000 -0700
 267 +++ coda-6.0.5-new/coda-src/vice/printvrdb.cc   2004-04-02 23:45:59.235904148 -0700
 268 @@ -66,7 +66,7 @@
 269      /* Load configuration file to get vice dir. */
 270      codaconf_init("server.conf");
 271
 272 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 273 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 274
 275      vice_dir_init(vicedir, 0);
 276  }
 277 Only in coda-6.0.5-new/coda-src/vice: printvrdb.cc~
 278 Only in coda-6.0.5-new/coda-src/vice: printvrdb.cc.orig
 279 diff -ur coda-6.0.5/coda-src/vice/server.conf.ex coda-6.0.5-new/coda-src/vice/server.conf.ex
 280 --- coda-6.0.5/coda-src/vice/server.conf.ex     2003-02-28 00:32:28.000000000 -0700
 281 +++ coda-6.0.5-new/coda-src/vice/server.conf.ex 2004-04-02 23:42:20.390451724 -0700
 282 @@ -11,7 +11,7 @@
 283  #
 284  # Prefix of server tree
 285  #
 286 -#vicedir=/vice
 287 +#vicedir=/var/lib/coda/vice
 288
 289  #
 290  # Should the server use private mmaps for RVM
 291 diff -ur coda-6.0.5/coda-src/vice/srv.cc coda-6.0.5-new/coda-src/vice/srv.cc
 292 --- coda-6.0.5/coda-src/vice/srv.cc     2003-11-21 14:49:59.000000000 -0700
 293 +++ coda-6.0.5-new/coda-src/vice/srv.cc 2004-04-02 23:47:00.177397620 -0700
 294 @@ -1272,7 +1272,7 @@
 295      CODACONF_INT(large, "large", 500);
 296      CODACONF_INT(small, "small", 500);
 297
 298 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 299 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 300      vice_dir_init(vicedir, ServerNumber);
 301
 302      CODACONF_INT(trace,                "trace",        0);
 303 Only in coda-6.0.5-new/coda-src/vice: srv.cc~
 304 Only in coda-6.0.5-new/coda-src/vice: srv.cc.orig
 305 diff -ur coda-6.0.5/coda-src/vol/testvrdb.cc coda-6.0.5-new/coda-src/vol/testvrdb.cc
 306 --- coda-6.0.5/coda-src/vol/testvrdb.cc 2003-05-23 12:27:33.000000000 -0600
 307 +++ coda-6.0.5-new/coda-src/vol/testvrdb.cc     2004-04-02 23:42:20.481439024 -0700
 308 @@ -103,7 +103,7 @@
 309      sprintf (confname, "%s.conf", serverconf);
 310      (void) conf_init(confname);
 311
 312 -    CONF_STR(vicedir,          "vicedir",         "/vice");
 313 +    CONF_STR(vicedir,          "vicedir",         "/var/lib/coda/vice");
 314
 315      vice_dir_init(vicedir, 0);
 316  }
 317 diff -ur coda-6.0.5/coda-src/volutil/backup.cc coda-6.0.5-new/coda-src/volutil/backup.cc
 318 --- coda-6.0.5/coda-src/volutil/backup.cc       2003-11-21 14:49:59.000000000 -0700
 319 +++ coda-6.0.5-new/coda-src/volutil/backup.cc   2004-04-02 23:47:14.826352843 -0700
 320 @@ -175,7 +175,7 @@
 321      /* Load configuration file to get vice dir. */
 322      codaconf_init("server.conf");
 323
 324 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 325 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 326
 327      vice_dir_init(vicedir, 0);
 328  }
 329 Only in coda-6.0.5-new/coda-src/volutil: backup.cc~
 330 Only in coda-6.0.5-new/coda-src/volutil: backup.cc.orig
 331 diff -ur coda-6.0.5/coda-src/volutil/volclient.cc coda-6.0.5-new/coda-src/volutil/volclient.cc
 332 --- coda-6.0.5/coda-src/volutil/volclient.cc    2004-02-26 21:12:10.000000000 -0700
 333 +++ coda-6.0.5-new/coda-src/volutil/volclient.cc        2004-04-02 23:47:30.425175479 -0700
 334 @@ -143,7 +143,7 @@
 335      /* Load configuration file to get vice dir. */
 336      codaconf_init("server.conf");
 337
 338 -    CODACONF_STR(vicedir, "vicedir", "/vice");
 339 +    CODACONF_STR(vicedir, "vicedir", "/var/lib/coda/vice");
 340      CODACONF_INT(nservers, "numservers", 1);
 341
 342      vice_dir_init(vicedir, 0);
 343 Only in coda-6.0.5-new/coda-src/volutil: volclient.cc~
 344 Only in coda-6.0.5-new/coda-src/volutil: volclient.cc.orig