path: root/coda/net-fs/coda/files/coda-6.9.3-gentoo-dirs.patch

diff -Nru coda-6.9.3/coda-src/scripts/bldvldb.sh.in coda-6.9.3-gt/coda-src/scripts/bldvldb.sh.in
--- coda-6.9.3/coda-src/scripts/bldvldb.sh.in	2004-03-05 22:12:44.000000000 +0100
+++ coda-6.9.3-gt/coda-src/scripts/bldvldb.sh.in	2008-07-12 23:15:47.141740587 +0200
@@ -28,7 +28,7 @@
 fi
 
 if [ x${vicedir} = x ] ; then
-  vicedir=/vice
+  vicedir=/var/lib/vice
 fi
 
 THISHOST=`hostname | tr A-Z a-z`
diff -Nru coda-6.9.3/coda-src/scripts/coda-server-logrotate coda-6.9.3-gt/coda-src/scripts/coda-server-logrotate
--- coda-6.9.3/coda-src/scripts/coda-server-logrotate	2003-08-04 20:09:58.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/coda-server-logrotate	2008-07-12 23:15:53.629741210 +0200
@@ -3,7 +3,7 @@
 # Simple logrotation for Coda server logfiles
 #
 
-vicedir=/vice
+vicedir=/var/lib/vice
 . "`codaconfedit server.conf`"
 
 srvdir="${vicedir}/srv"
diff -Nru coda-6.9.3/coda-src/scripts/codastart coda-6.9.3-gt/coda-src/scripts/codastart
--- coda-6.9.3/coda-src/scripts/codastart	2006-09-19 19:48:57.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/codastart	2008-07-12 23:16:40.249741012 +0200
@@ -1,11 +1,11 @@
 #!/bin/sh
-if [ "`cat /vice/hostname`" = "`cat /vice/db/scm`" ]
+if [ "`cat /var/lib/vice/hostname`" = "`cat /var/lib/vice/db/scm`" ]
 then
     updatesrv &
     auth2 &
 else
     auth2 -chk &
 fi
-updateclnt -h `grep '' /vice/db/scm` &
+updateclnt -h `grep '' /var/lib/vice/db/scm` &
 startserver
 
diff -Nru coda-6.9.3/coda-src/scripts/createvol_rep.in coda-6.9.3-gt/coda-src/scripts/createvol_rep.in
--- coda-6.9.3/coda-src/scripts/createvol_rep.in	2007-06-26 18:18:28.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/createvol_rep.in	2008-07-12 23:17:29.601740626 +0200
@@ -32,7 +32,7 @@
 export PATH
 
 # load the server configuration file
-vicedir=/vice
+vicedir=/var/lib/vice
 . "`@sbindir@/codaconfedit server.conf`"
 
 if [ ! -f ${vicedir}/hostname -o ! -f ${vicedir}/db/scm ] ; then
diff -Nru coda-6.9.3/coda-src/scripts/purgevol_rep.in coda-6.9.3-gt/coda-src/scripts/purgevol_rep.in
--- coda-6.9.3/coda-src/scripts/purgevol_rep.in	2005-05-04 14:13:41.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/purgevol_rep.in	2008-07-12 23:18:23.829740822 +0200
@@ -24,7 +24,7 @@
 export PATH
 
 # load the server configuration file
-vicedir=/vice
+vicedir=/var/lib/vice
 . "`@sbindir@/codaconfedit server.conf`"
 
 SCM=`cat ${vicedir}/db/scm`
diff -Nru coda-6.9.3/coda-src/scripts/startserver.in coda-6.9.3-gt/coda-src/scripts/startserver.in
--- coda-6.9.3/coda-src/scripts/startserver.in	2004-10-26 23:36:43.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/startserver.in	2008-07-12 23:18:54.541741263 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ x${vicedir} = x ]; then
-  vicedir=/vice
+  vicedir=/var/lib/vice
 fi
 
 # Rotate logfiles
diff -Nru coda-6.9.3/coda-src/scripts/venus-setup.in coda-6.9.3-gt/coda-src/scripts/venus-setup.in
--- coda-6.9.3/coda-src/scripts/venus-setup.in	2007-08-10 20:02:24.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/venus-setup.in	2008-07-12 23:22:24.537741513 +0200
@@ -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/lib/coda/etc/console
+cachedir=/var/lib/coda/venus.cache
+checkpointdir=/var/lib/coda/spool
+logfile=/var/lib/coda/etc/venus.log
+marinersocket=/var/lib/coda/spool/mariner
+pid_file=/var/lib/coda/venus.cache/pid
+run_control_file=/var/lib/coda/venus.cache/VENUS_CTRL
+rvm_log=/var/lib/coda/LOG
+rvm_data=/var/lib/coda/DATA
+mountpoint=/mnt/coda
 
 # override with user defined paths
 if [ x${conf} != x/dev/null ] ; then
@@ -224,8 +224,8 @@
 # next run will always initialize
 touch $cachedir/INIT
 
-if [ -f /usr/coda/etc/vstab ] ; then
-    echo "To avoid confusion, remove /usr/coda/etc/vstab, we have switched to"
+if [ -f /var/lib/coda/etc/vstab ] ; then
+    echo "To avoid confusion, remove /var/lib/coda/etc/vstab, we have switched to"
     echo "the /etc/coda/venus.conf file for configuring the client."
 fi
 
diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-rvm.in coda-6.9.3-gt/coda-src/scripts/vice-setup-rvm.in
--- coda-6.9.3/coda-src/scripts/vice-setup-rvm.in	2006-09-19 19:35:02.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-rvm.in	2008-07-12 23:23:28.909741348 +0200
@@ -42,7 +42,7 @@
 #
 
 # defaults, will be overridden by settings in the server.conf file
-vicedir=/vice
+vicedir=/var/lib/vice
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-scm coda-6.9.3-gt/coda-src/scripts/vice-setup-scm
--- coda-6.9.3/coda-src/scripts/vice-setup-scm	2005-09-01 23:59:24.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-scm	2008-07-12 23:23:46.517741267 +0200
@@ -36,7 +36,7 @@
 . "`codaconfedit server.conf`"
 
 if [ x${vicedir} = x ] ; then
-  vicedir=/vice
+  vicedir=/var/lib/vice
 fi
 
 # current first maximum replicated volume id (0x7f000000)
diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-srvdir coda-6.9.3-gt/coda-src/scripts/vice-setup-srvdir
--- coda-6.9.3/coda-src/scripts/vice-setup-srvdir	2005-09-01 23:59:24.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-srvdir	2008-07-12 23:24:28.813741293 +0200
@@ -28,7 +28,7 @@
 #
 # Configuration
 #
-vicedir=/vice
+vicedir=/var/lib/vice
 numservers=1
 . "`codaconfedit server.conf`"
 
@@ -73,15 +73,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) [/mnt/vicepa]? "
     else
-	echon 'Where shall we store your file data [/vicepa]? '
+	echon 'Where shall we store your file data [/mnt/vicepa]? '
     fi
     srvdir=
     read srvdir
 
     if [ "x$srvdir" = x ]; then
-	srvdir=/vicepa
+	srvdir=/mnt/vicepa
     fi
 
     # Create the directory if needed.  (Symlink is OK.)
diff -Nru coda-6.9.3/coda-src/scripts/vice-setup-user coda-6.9.3-gt/coda-src/scripts/vice-setup-user
--- coda-6.9.3/coda-src/scripts/vice-setup-user	2004-12-22 16:06:25.000000000 +0100
+++ coda-6.9.3-gt/coda-src/scripts/vice-setup-user	2008-07-12 23:24:51.889740616 +0200
@@ -31,7 +31,7 @@
 #
 # Configuration
 #
-vicedir=/vice
+vicedir=/var/lib/vice
 . "`codaconfedit server.conf`"
 
 # Set up password and group files for Coda
diff -Nru coda-6.9.3/coda-src/scripts/vice-setup.in coda-6.9.3-gt/coda-src/scripts/vice-setup.in
--- coda-6.9.3/coda-src/scripts/vice-setup.in	2007-07-20 23:34:49.000000000 +0200
+++ coda-6.9.3-gt/coda-src/scripts/vice-setup.in	2008-07-12 23:25:43.881740900 +0200
@@ -122,12 +122,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/vice] "
 vicedir=""
 read vicedir
 
 if [ "x$vicedir" = x ] ; then
-   vicedir=/vice
+   vicedir=/var/lib/vice
 fi
 
 if [ $mkconf = 1 ] ; then
@@ -410,7 +410,7 @@
 	echo "That seems to have worked..."
 	echo "If you have a working Coda client you should now be able to"
 	echo "access the new Coda realm"
-	echo " - cfs lv /coda/${hn}/"
+	echo " - cfs lv /mnt/coda/${hn}/"
     fi
     echo
     echo "enjoy Coda."
@@ -444,7 +444,7 @@
 echo "After that, there is still some configuration needed on the SCM before"
 echo "this server can be started."
 echo
-echo "An entry for this host is needed in /vice/db/servers"
+echo "An entry for this host is needed in /var/lib/vice/db/servers"
 echo "Then all servers need to be shut down and restarted, as they need to"
 echo "know about the new server."
 echo "After all that it _should_ be ok to start the new server and create"
diff -Nru coda-6.9.3/coda-src/venus/venus.conf.ex coda-6.9.3-gt/coda-src/venus/venus.conf.ex
--- coda-6.9.3/coda-src/venus/venus.conf.ex	2007-10-17 21:26:34.000000000 +0200
+++ coda-6.9.3-gt/coda-src/venus/venus.conf.ex	2008-07-12 22:53:43.817740642 +0200
@@ -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/lib/coda/etc/console).
 #
-#errorlog=/usr/coda/etc/console
+errorlog=/var/lib/coda/etc/console
 
 #
 # What is the uid of the primary user of this system. The primary user
@@ -72,43 +72,43 @@
 
 #
 # 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/lib/coda/venus.cache)
 #
-#cachedir=/usr/coda/venus.cache
+cachedir=/var/lib/coda/venus.cache
 
 #
 # 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/lib/coda/spool)
 #
-#checkpointdir=/usr/coda/spool
+checkpointdir=/var/lib/coda/spool
 
 #
 # Where does venus store it's pidfile
 #
-#pid_file=/usr/coda/venus.cache/pid
+pid_file=/var/lib/coda/venus.cache/pid
 
 #
 # What file does vutil use to control venus
 #
-#run_control_file=/usr/coda/venus.cache/VENUS_CTRL
+run_control_file=/var/lib/coda/venus.cache/VENUS_CTRL
 
 #
 # Venus log file
 #
-#logfile=/usr/coda/etc/venus.log
+logfile=/var/lib/coda/etc/venus.log
 
 #
 # Mariner socket,
@@ -116,7 +116,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/lib/coda/spool/mariner
 
 #
 # Dont use RVM,
@@ -271,3 +271,11 @@
 #
 #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=/coda
+mountpoint=/mnt/coda
diff -Nru coda-6.9.3/coda-src/vice/server.conf.ex coda-6.9.3-gt/coda-src/vice/server.conf.ex
--- coda-6.9.3/coda-src/vice/server.conf.ex	2007-06-26 18:18:19.000000000 +0200
+++ coda-6.9.3-gt/coda-src/vice/server.conf.ex	2008-07-12 22:54:43.185740582 +0200
@@ -11,7 +11,7 @@
 #
 # Prefix of server tree
 #
-#vicedir=/vice
+vicedir=/var/lib/vice
 
 #
 # Should the server use private mmaps for RVM