--- auth2	2004-03-23 21:18:49.000000000 +0100
+++ auth2-patched	2004-07-03 23:45:54.973152280 +0200
@@ -3,19 +3,25 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/auth2,v 1.1 2004/03/23 20:18:49 dragonheart Exp $
 
+
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /var/lib/vice/hostname ] ; then
-		eerror "Please set up vice before starting the service..."
+	if [ ! -e /etc/coda/server.conf ] ; then
+		eerror "Please run vice-setup before starting the service..."
+		return 1
+	fi
+	eval `grep "^vicedir=" /etc/coda/server.conf || echo vicedir=/var/lib/vice`
+	if [ ! -e $vicedir/hostname ] ; then
+		eerror "Please run vice-setup before starting the service..."
 		return 1
 	fi
 }
 
 we_are_scm() {
-	if [ "`cat /var/lib/vice/hostname`" = "`cat /var/lib/vice/db/scm`" ] ; then
+	if [ "`cat $vicedir/hostname`" = "`cat $vicedir/db/scm`" ] ; then
 		return 0
 	else
 		return 1
--- coda-update	2004-03-23 21:18:49.000000000 +0100
+++ coda-update-patched	2004-07-03 23:46:11.088702344 +0200
@@ -8,7 +8,7 @@
 }
 
 we_are_scm() {
-	if [ "`cat /var/lib/vice/hostname`" = "`cat /var/lib/vice/db/scm`" ] ; then
+	if [ "`cat $vicedir/hostname`" = "`cat $vicedir/db/scm`" ] ; then
 		return 0
 	else
 		return 1
@@ -16,10 +16,16 @@
 }
 
 checkconfig() {
-	if [ ! -e /var/lib/vice/hostname ] ; then
-		eerror "Please set up coda before starting the service..."
-		return 1
-	fi
+
+        if [ ! -e /etc/coda/server.conf ] ; then
+                eerror "Please run vice-setup before starting the service..."
+                return 1
+        fi
+        eval `grep "^vicedir=" /etc/coda/server.conf || echo vicedir=/var/lib/vice`
+        if [ ! -e $vicedir/hostname ] ; then
+                eerror "Please run vice-setup before starting the service..."
+                return 1
+        fi
 }
 
 start() {
--- codasrv	2004-03-23 21:18:49.000000000 +0100
+++ codasrv-patched	2004-07-03 23:46:19.337448344 +0200
@@ -8,14 +8,19 @@
 }
 
 checkconfig() {
-	if [ ! -e /var/lib/vice/hostname ] ; then
-		eerror "Please set up vice before starting the service..."
-		return 1
-	fi
+        if [ ! -e /etc/coda/server.conf ] ; then
+                eerror "Please run vice-setup before starting the service..."
+                return 1
+        fi
+        eval `grep "^vicedir=" /etc/coda/server.conf || echo vicedir=/var/lib/vice`
+        if [ ! -e $vicedir/hostname ] ; then
+                eerror "Please run vice-setup before starting the service..."
+                return 1
+        fi
 }
 
 we_are_scm() {
-	if [ "`cat /var/lib/vice/hostname`" = "`cat /var/lib/vice/db/scm`" ] ; then
+	if [ "`cat $vicedir/hostname`" = "`cat $vicedir/db/scm`" ] ; then
 		return 0
 	else
 		return 1