[patch] coda-6.9.4-gentoo-dirs.patch

coda-6.9.4-gentoo-dirs.patch (text/plain), 16.00 KB, created by George Shapovalov (RETIRED) on 2009-11-11 09:38:03 UTC

diff -ruN coda-6.9.4.orig/coda-src/scripts/venus.init.in coda-6.9.4/coda-src/scripts/venus.init.in
--- coda-6.9.4.orig/coda-src/scripts/venus.init.in	2007-08-01 22:15:27.000000000 +0200
+++ coda-6.9.4/coda-src/scripts/venus.init.in	2009-11-09 17:33:52.000000000 +0100
@@ -17,7 +17,7 @@
 export PATH
 
 # defaults
-pid_file=/usr/coda/venus.cache/pid
+pid_file=/var/cache/venus/pid
 mountpoint=/coda
 
 # overridden from the venus.conf
diff -ruN coda-6.9.4.orig/coda-src/scripts/venus-setup.in coda-6.9.4/coda-src/scripts/venus-setup.in
--- coda-6.9.4.orig/coda-src/scripts/venus-setup.in	2007-08-10 20:02:24.000000000 +0200
+++ coda-6.9.4/coda-src/scripts/venus-setup.in	2009-11-09 16:01:14.000000000 +0100
@@ -65,16 +65,16 @@
 #fi
 
 # default paths
-errorlog=/usr/coda/etc/console
-cachedir=/usr/coda/venus.cache
-checkpointdir=/usr/coda/spool
-logfile=/usr/coda/etc/venus.log
-marinersocket=/usr/coda/spool/mariner
-pid_file=/usr/coda/venus.cache/pid
-run_control_file=/usr/coda/venus.cache/VENUS_CTRL
-rvm_log=/usr/coda/LOG
-rvm_data=/usr/coda/DATA
-mountpoint=/coda
+errorlog=/var/log/coda/console
+cachedir=/var/cache/venus
+checkpointdir=/var/spool/coda
+logfile=/var/log/coda/venus.log
+marinersocket=/var/spool/coda/mariner
+pid_file=/var/cache/venus/pid
+run_control_file=/var/cache/venus/VENUS_CTRL
+rvm_log=/var/lib/coda/LOG
+rvm_data=/var/lib/coda/DATA
+mountpoint=/media/coda
 
 # override with user defined paths
 if [ x${conf} != x/dev/null ] ; then
diff -ruN coda-6.9.4.orig/coda-src/scripts/vice-setup.in coda-6.9.4/coda-src/scripts/vice-setup.in
--- coda-6.9.4.orig/coda-src/scripts/vice-setup.in	2008-08-08 21:09:37.000000000 +0200
+++ coda-6.9.4/coda-src/scripts/vice-setup.in	2009-11-09 17:06:36.000000000 +0100
@@ -120,12 +120,12 @@
     fi
 fi
 
-echon "What is the root directory for your coda server(s)? [/vice] "
+echon "What is the root directory for your coda server(s)? [/var/lib/coda/vice] "
 vicedir=""
 read vicedir
 
 if [ "x$vicedir" = x ] ; then
-    vicedir=/vice
+    vicedir=/var/lib/coda/vice
 fi
 
 if [ $mkconf = 1 ] ; then
diff -ruN coda-6.9.4.orig/coda-src/scripts/vice-setup-rvm.in coda-6.9.4/coda-src/scripts/vice-setup-rvm.in
--- coda-6.9.4.orig/coda-src/scripts/vice-setup-rvm.in	2006-09-19 19:35:02.000000000 +0200
+++ coda-6.9.4/coda-src/scripts/vice-setup-rvm.in	2009-11-09 16:01:14.000000000 +0100
@@ -42,7 +42,7 @@
 #
 
 # defaults, will be overridden by settings in the server.conf file
-vicedir=/vice
+vicedir=/var/lib/coda/vice
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff -ruN coda-6.9.4.orig/coda-src/scripts/vice-setup-srvdir coda-6.9.4/coda-src/scripts/vice-setup-srvdir
--- coda-6.9.4.orig/coda-src/scripts/vice-setup-srvdir	2008-12-19 23:04:38.000000000 +0100
+++ coda-6.9.4/coda-src/scripts/vice-setup-srvdir	2009-11-09 16:01:14.000000000 +0100
@@ -76,15 +76,15 @@
     echo
     
     if [ $numservers -gt 1 ]; then
-	echon "Where shall we store your file data for server $n ($hn) [/vicepa]? "
+	echon "Where shall we store your file data for server $n ($hn) [/var/lib/coda/vicepa]? "
     else
-	echon 'Where shall we store your file data [/vicepa]? '
+	echon 'Where shall we store your file data [/var/lib/coda/vicepa]? '
     fi
     srvdir=
     read srvdir
 
     if [ "x$srvdir" = x ]; then
-	srvdir=/vicepa
+	srvdir=/var/lib/coda/vicepa
     fi
 
     # Create the directory if needed.  (Symlink is OK.)
diff -ruN coda-6.9.4.orig/coda-src/vcodacon/monitor.cc coda-6.9.4/coda-src/vcodacon/monitor.cc
--- coda-6.9.4.orig/coda-src/vcodacon/monitor.cc	2007-12-17 18:19:56.000000000 +0100
+++ coda-6.9.4/coda-src/vcodacon/monitor.cc	2009-11-10 08:57:09.000000000 +0100
@@ -81,7 +81,7 @@
     TheMon = this;
   }
 
-  CODACONF_STR(marinerport, "marinersocket", "/usr/coda/spool/mariner");
+  CODACONF_STR(marinerport, "marinersocket", "/var/spool/coda/mariner");
 
   if (!conn.isOpen()) {
 #if defined(HAVE_SYS_UN_H) && !defined(WIN32)
diff -ruN coda-6.9.4.orig/coda-src/venus/venus.8 coda-6.9.4/coda-src/venus/venus.8
--- coda-6.9.4.orig/coda-src/venus/venus.8	2006-09-21 16:03:18.000000000 +0200
+++ coda-6.9.4/coda-src/venus/venus.8	2009-11-09 17:26:40.000000000 +0100
@@ -61,7 +61,7 @@
 \fBrwx------\fR to protect the cache from
 malicious local users.
 
-Default: \fB/usr/coda/venus.cache\fR
+Default: \fB/var/cache/venus\fR
 .TP
 \fB-m\fR
 Controls what Coda Optimistic Protocol (COP) options
@@ -131,7 +131,7 @@
 \fB-vld\fR
 Location of the venus log file or partition.
 
-Default: \fB/usr/coda/LOG\fR
+Default: \fB/var/lib/coda/LOG\fR
 .TP
 \fB-vlds\fR
 Size of the log file or partition.
@@ -139,7 +139,7 @@
 \fB-vdd\fR
 Location of the venus data file or partition.
 
-Default: \fB/usr/coda/DATA\fR
+Default: \fB/var/lib/coda/DATA\fR
 .TP
 \fB-vdds\fR
 Size of the data file or partition.
diff -ruN coda-6.9.4.orig/coda-src/venus/venus.cc coda-6.9.4/coda-src/venus/venus.cc
--- coda-6.9.4.orig/coda-src/venus/venus.cc	2008-08-08 21:09:38.000000000 +0200
+++ coda-6.9.4/coda-src/venus/venus.cc	2009-11-10 09:04:28.000000000 +0100
@@ -398,11 +398,11 @@
 	    else if (STREQ(argv[i], "-rvmt"))
 		i++, RvmType = (rvm_type_t)(atoi(argv[i]));
 	    else if (STREQ(argv[i], "-vld"))          /* location of log device */
-		i++, VenusLogDevice = argv[i];        /* normally /usr/coda/LOG */
+		i++, VenusLogDevice = argv[i];        /* normally /var/lib/coda/LOG */
 	    else if (STREQ(argv[i], "-vlds"))         /* log device size */
 		i++, VenusLogDeviceSize = atoi(argv[i]);  
 	    else if (STREQ(argv[i], "-vdd"))          /* location of data device */
-                i++, VenusDataDevice = argv[i];       /* normally /usr/coda/DATA */
+                i++, VenusDataDevice = argv[i];       /* normally /var/lib/coda/DATA */
 	    else if (STREQ(argv[i], "-vdds"))         /* meta-data device size */
 		i++, VenusDataDeviceSize = atoi(argv[i]);
 	    else if (STREQ(argv[i], "-rdscs"))        
@@ -476,19 +476,19 @@
 
     CODACONF_INT(CacheBlocks,	    "cacheblocks",   40000);
     CODACONF_STR(CacheDir,	    "cachedir",      DFLT_CD);
-    CODACONF_STR(SpoolDir,	    "checkpointdir", "/usr/coda/spool");
+    CODACONF_STR(SpoolDir,	    "checkpointdir", "/var/spool/coda");
     CODACONF_STR(VenusLogFile,	    "logfile",	     DFLT_LOGFILE);
     CODACONF_STR(consoleFile,	    "errorlog",      DFLT_ERRLOG);
     CODACONF_STR(kernDevice,	    "kerneldevice",  "/dev/cfs0,/dev/coda/0");
     CODACONF_INT(MapPrivate,	    "mapprivate",     0);
-    CODACONF_STR(MarinerSocketPath, "marinersocket", "/usr/coda/spool/mariner");
+    CODACONF_STR(MarinerSocketPath, "marinersocket", "/var/spool/coda/mariner");
     CODACONF_INT(masquerade_port,   "masquerade_port", 0);
     CODACONF_INT(allow_backfetch,   "allow_backfetch", 0);
     CODACONF_STR(venusRoot,	    "mountpoint",     DFLT_VR);
     CODACONF_INT(PrimaryUser,	    "primaryuser",    UNSET_PRIMARYUSER);
     CODACONF_STR(realmtab,	    "realmtab",	      "/etc/coda/realms");
-    CODACONF_STR(VenusLogDevice,    "rvm_log",        "/usr/coda/LOG");
-    CODACONF_STR(VenusDataDevice,   "rvm_data",       "/usr/coda/DATA");
+    CODACONF_STR(VenusLogDevice,    "rvm_log",        "/var/lib/coda/LOG");
+    CODACONF_STR(VenusDataDevice,   "rvm_data",       "/var/lib/coda/DATA");
 
     CODACONF_INT(rpc2_timeout,	    "RPC2_timeout",   DFLT_TO);
     CODACONF_INT(rpc2_retries,	    "RPC2_retries",   DFLT_RT);
diff -ruN coda-6.9.4.orig/coda-src/venus/venus.conf.ex coda-6.9.4/coda-src/venus/venus.conf.ex
--- coda-6.9.4.orig/coda-src/venus/venus.conf.ex	2008-04-04 18:28:57.000000000 +0200
+++ coda-6.9.4/coda-src/venus/venus.conf.ex	2009-11-10 09:13:52.000000000 +0100
@@ -20,7 +20,7 @@
 # Which file is used for realm lookups, before we look at dns SRV and A
 # records.
 #
-#realmtab=/etc/coda/realms
+realmtab=/etc/coda/realms
 
 #
 # What should the size of the local cache be in 1k blocks. If this is
@@ -55,9 +55,9 @@
 
 #
 # Which file should receive venus's stderr output.
-# (default is /usr/coda/etc/console).
+# (default is /var/log/coda/etc/console).
 #
-#errorlog=/usr/coda/etc/console
+errorlog=/var/log/coda/console
 
 #
 # What is the uid of the primary user of this system. The primary user
@@ -72,28 +72,28 @@
 
 #
 # What are the locations of the rvm log and data files or partitions.
-# (default /usr/coda/{LOG,DATA}
+# (default /var/lib/coda/{LOG,DATA}
 #
 # CAUTION: these are _unrelated_ to the server's rvm log and data. Also
 # when specifying partitions, do NOT specify any partions which might
 # have an existing filesystem, as you WILL lose all data during
 # initialization.
 #
-#rvm_log=/usr/coda/LOG
-#rvm_data=/usr/coda/DATA
+rvm_log=/var/lib/coda/LOG
+rvm_data=/var/lib/coda/DATA
 
 #
 # Where should venus keep it's pool of cached files.
-# (default is /usr/coda/venus.cache)
+# (default is /var/cache/venus)
 #
-#cachedir=/usr/coda/venus.cache
+cachedir=/var/cache/venus
 
 #
 # Where should venus store snapshots of the modification logs. This is
 # primarily to provide some safe fallback when venus dies or messes up
-# the CML during reintegration. (default is /usr/coda/spool)
+# the CML during reintegration. (default is /var/spool/coda)
 #
-#checkpointdir=/usr/coda/spool
+checkpointdir=/var/spool/coda
 
 #
 # Checkpoint archive format
@@ -113,17 +113,17 @@
 #
 # Where does venus store it's pidfile
 #
-#pid_file=/usr/coda/venus.cache/pid
+pid_file=/var/cache/venus/pid
 
 #
 # What file does vutil use to control venus
 #
-#run_control_file=/usr/coda/venus.cache/VENUS_CTRL
+run_control_file=/var/cache/venus/VENUS_CTRL
 
 #
 # Venus log file
 #
-#logfile=/usr/coda/etc/venus.log
+logfile=/var/log/coda/venus.log
 
 #
 # Mariner socket,
@@ -131,7 +131,7 @@
 # codacon and spy use to talk to venus. On other platforms they will
 # connect to venus through tcp port 2430.
 #
-#marinersocket=/usr/coda/spool/mariner
+marinersocket=/var/spool/coda/mariner
 
 #
 # Dont use RVM,
@@ -303,3 +303,12 @@
 #
 #isr=0
 
+# Mountpoint,
+# Where the coda filesystem is mounted, many application still depend on
+# this being /coda. I am unsure whether it matters much on Windows95/98,
+# but we normally use N: for those.
+#
+#mountpoint=N:
+#mountpoint=/media/coda
+mountpoint=/media/coda
+
diff -ruN coda-6.9.4.orig/coda-src/venus/venus.private.h coda-6.9.4/coda-src/venus/venus.private.h
--- coda-6.9.4.orig/coda-src/venus/venus.private.h	2008-10-06 18:52:46.000000000 +0200
+++ coda-6.9.4/coda-src/venus/venus.private.h	2009-11-09 17:24:08.000000000 +0100
@@ -89,13 +89,13 @@
 
 /*  *****  parameter defaults.  ***** */
 #define DFLT_VR "/coda"				/* venus root */
-#define DFLT_CD "/usr/coda/venus.cache"		/* cache directory */
+#define DFLT_CD "/var/cache/venus"		/* cache directory */
 /* the next two are relative to cachedir if they do not start with '/' */
 #define DFLT_PIDFILE "pid"			/* default pid file */
 #define DFLT_CTRLFILE "VENUS_CTRL"		/* default control file */
 
-#define DFLT_LOGFILE "/usr/coda/etc/venus.log"	/* venus log file */
-#define DFLT_ERRLOG  "/usr/coda/etc/console"	/* venus error log */
+#define DFLT_LOGFILE "/var/log/coda/venus.log"	/* venus log file */
+#define DFLT_ERRLOG  "/var/log/coda/console"	/* venus error log */
 
 /* rule of thumb */
 const int BLOCKS_PER_FILE = 24;
diff -ruN coda-6.9.4.orig/coda-src/vice/server.conf.ex coda-6.9.4/coda-src/vice/server.conf.ex
--- coda-6.9.4.orig/coda-src/vice/server.conf.ex	2008-02-07 20:29:26.000000000 +0100
+++ coda-6.9.4/coda-src/vice/server.conf.ex	2009-11-09 16:01:14.000000000 +0100
@@ -11,7 +11,7 @@
 #
 # Prefix of server tree
 #
-#vicedir=/vice
+#vicedir=/var/lib/coda/vice
 
 #
 # Should the server use private mmaps for RVM
diff -ruN coda-6.9.4.orig/coda-src/vtools/cfs.1 coda-6.9.4/coda-src/vtools/cfs.1
--- coda-6.9.4.orig/coda-src/vtools/cfs.1	2008-02-15 21:28:27.000000000 +0100
+++ coda-6.9.4/coda-src/vtools/cfs.1	2009-11-10 09:03:25.000000000 +0100
@@ -114,7 +114,7 @@
 .TP
 \fBcheckpointml\fR
 Checkpoint volume modify log.  This command will create a
-checkpoint file /usr/coda/spool/uid/vol@mountpt\&.  Where uid is your local user id,
+checkpoint file /var/spool/coda/uid/vol@mountpt\&.  Where uid is your local user id,
 vol is the volume being checkpointed,
 and mountpt is the volume's mount point.
 
diff -ruN coda-6.9.4.orig/coda-src/vtools/cfs.cc coda-6.9.4/coda-src/vtools/cfs.cc
--- coda-6.9.4.orig/coda-src/vtools/cfs.cc	2008-10-06 18:52:42.000000000 +0200
+++ coda-6.9.4/coda-src/vtools/cfs.cc	2009-11-10 09:01:39.000000000 +0100
@@ -806,7 +806,7 @@
 	filenames = argv;
     }
     else
-    {/* No filenames specified on cmd line: look in /usr/coda/spool/<uid> */
+    {/* No filenames specified on cmd line: look in pid file */
 	first = 0;
 	last = findclosures(&filenames) - 1;
 	if (last < 0) {printf("No closures found\n"); exit(-1);}
@@ -896,7 +896,7 @@
 
 
 static int findclosures(char ***clist)
-{/* Constructs an argv[]-like structure of closures in /usr/coda/spool/<uid>.
+{/* Constructs an argv[]-like structure of closures in /var/spool/coda/<uid>.
     Return the # of closures found.
   */
     int n = 0;
@@ -906,7 +906,7 @@
     DIR *dirp;
     struct dirent *td;
 
-    CODACONF_STR(checkpointdir, "checkpointdir", "/usr/coda/spool");
+    CODACONF_STR(checkpointdir, "checkpointdir", "/var/spool/coda");
     sprintf(spooldir, "%s/%d", checkpointdir, getuid());
 
     dirp = opendir(spooldir);
@@ -2151,7 +2151,7 @@
 	filenames = argv;
     }
     else
-    {/* No filenames specified on cmd line: look in /usr/coda/spool/<uid> */
+    {/* No filenames specified on cmd line: look in pid file */
 	first = 0;
 	last = findclosures(&filenames) - 1;
 	if (last < 0) {printf("No closures found\n"); exit(-1);}
diff -ruN coda-6.9.4.orig/coda-src/vtools/codacon.cc coda-6.9.4/coda-src/vtools/codacon.cc
--- coda-6.9.4.orig/coda-src/vtools/codacon.cc	2007-12-17 18:19:58.000000000 +0100
+++ coda-6.9.4/coda-src/vtools/codacon.cc	2009-11-10 09:02:11.000000000 +0100
@@ -107,7 +107,7 @@
 
 	codaconf_init("venus.conf");
 	MarinerSocketPath = codaconf_lookup("marinersocket",
-					    "/usr/coda/spool/mariner");
+					    "/var/spool/coda/mariner");
 	memset(&s_un, 0, sizeof(s_un));
 	s_un.sun_family = AF_UNIX;
 	strcpy(s_un.sun_path, MarinerSocketPath);
diff -ruN coda-6.9.4.orig/coda-src/vtools/gcodacon.in coda-6.9.4/coda-src/vtools/gcodacon.in
--- coda-6.9.4.orig/coda-src/vtools/gcodacon.in	2007-12-11 21:06:07.000000000 +0100
+++ coda-6.9.4/coda-src/vtools/gcodacon.in	2009-11-10 09:02:26.000000000 +0100
@@ -253,7 +253,7 @@
 
 	if not self.use_tcp:
 	    venusconf = parse_codaconf(venus_conf)
-	    mariner = venusconf.get("marinersocket", "/usr/coda/spool/mariner")
+	    mariner = venusconf.get("marinersocket", "/var/spool/coda/mariner")
 	    self.addrs = [(socket.AF_UNIX, socket.SOCK_STREAM, 0, 0, mariner)]
 	else:
 	    self.addrs = socket.getaddrinfo(None, 'venus', socket.AF_INET,
diff -ruN coda-6.9.4.orig/coda-src/vtools/spy.cc coda-6.9.4/coda-src/vtools/spy.cc
--- coda-6.9.4.orig/coda-src/vtools/spy.cc	2007-12-17 18:19:58.000000000 +0100
+++ coda-6.9.4/coda-src/vtools/spy.cc	2009-11-10 09:02:55.000000000 +0100
@@ -116,7 +116,7 @@
 
 	codaconf_init("venus.conf");
 	MarinerSocketPath = codaconf_lookup("marinersocket",
-					    "/usr/coda/spool/mariner");
+					    "/var/spool/coda/mariner");
 	memset(&s_un, 0, sizeof(s_un));
 	s_un.sun_family = AF_UNIX;
 	strcpy(s_un.sun_path, MarinerSocketPath);
diff -ruN coda-6.9.4.orig/tools/coda.spec.in coda-6.9.4/tools/coda.spec.in
--- coda-6.9.4.orig/tools/coda.spec.in	2007-12-17 19:22:26.000000000 +0100
+++ coda-6.9.4/tools/coda.spec.in	2009-11-10 08:55:12.000000000 +0100
@@ -101,8 +101,8 @@
 make prefix=$RPM_BUILD_ROOT/usr install
 
 mkdir -p $RPM_BUILD_ROOT/coda
-mkdir -p $RPM_BUILD_ROOT/usr/coda/etc
-mkdir -p $RPM_BUILD_ROOT/usr/coda/venus.cache
+mkdir -p $RPM_BUILD_ROOT/var/log/coda
+mkdir -p $RPM_BUILD_ROOT/var/cache/coda
 touch $RPM_BUILD_ROOT/coda/NOT_REALLY_CODA
 
 %clean
@@ -118,8 +118,8 @@
 fi
 
 %post client
-if [ -e /usr/coda/venus.cache/pid ]; then
-    rm -f /usr/coda/venus.cache/pid
+if [ -e /var/cache/venus/pid ]; then
+    rm -f /var/cache/venus/pid
 fi
 if [ ! -e /etc/coda/venus.conf ]; then
 	/usr/sbin/venus-setup "" 100000
@@ -150,9 +150,9 @@
 
 %files client
 %defattr(-,root,root)
-%dir /usr/coda
-%dir /usr/coda/etc
-%dir /usr/coda/venus.cache
+#%dir /usr/coda
+%dir /var/log/coda
+%dir /var/cache/venus
 %dir /coda
 %verify() /coda/NOT_REALLY_CODA
 /etc/coda/realms