Scripts enhanced thanks to Maurice van der Pot <griffon26@kfk4ever.com>

5 files changed, 41 insertions, 27 deletions

diff --git a/net-fs/coda/ChangeLog b/net-fs/coda/ChangeLog
index 7f35a96653cf..89c35b107910 100644
--- a/net-fs/coda/ChangeLog
+++ b/net-fs/coda/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/coda
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.6 2004/06/24 22:42:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/ChangeLog,v 1.7 2004/07/16 23:22:03 dragonheart Exp $
+
+  17 Jul 2004; Daniel Black <dragonheart@gentoo.org> files/auth2,
+  files/coda-update, files/codasrv, files/venus:
+  Scripts enhanced thanks to Maurice van der Pot <griffon26@kfk4ever.com> in bug
+  #26132
 
   12 May 2004; David Holm <dholm@gentoo.org> coda-6.0.6.ebuild:
   Added to ~ppc.
diff --git a/net-fs/coda/files/auth2 b/net-fs/coda/files/auth2
index f7654074e82f..4c9f800835da 100644
--- a/net-fs/coda/files/auth2
+++ b/net-fs/coda/files/auth2
@@ -1,21 +1,26 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/auth2,v 1.2 2004/07/14 23:33:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/auth2,v 1.3 2004/07/16 23:22:03 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
diff --git a/net-fs/coda/files/coda-update b/net-fs/coda/files/coda-update
index fec27837f616..c059f96a26cb 100644
--- a/net-fs/coda/files/coda-update
+++ b/net-fs/coda/files/coda-update
@@ -1,14 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/coda-update,v 1.2 2004/07/14 23:33:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/coda-update,v 1.3 2004/07/16 23:22:03 dragonheart Exp $
 
 depend() {
 	need net auth2
 }
 
 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 @@ we_are_scm() {
 }
 
 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() {
diff --git a/net-fs/coda/files/codasrv b/net-fs/coda/files/codasrv
index e74826b21358..1fcc3bcae791 100644
--- a/net-fs/coda/files/codasrv
+++ b/net-fs/coda/files/codasrv
@@ -1,21 +1,26 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/codasrv,v 1.2 2004/07/14 23:33:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/codasrv,v 1.3 2004/07/16 23:22:03 dragonheart Exp $
 
 depend() {
 	need net coda-update auth2
 }
 
 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
diff --git a/net-fs/coda/files/venus b/net-fs/coda/files/venus
index 021cbfe4b034..0a6dbf05ee02 100644
--- a/net-fs/coda/files/venus
+++ b/net-fs/coda/files/venus
@@ -1,17 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/venus,v 1.2 2004/07/14 23:33:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/coda/files/venus,v 1.3 2004/07/16 23:22:03 dragonheart Exp $
 
 depend() {
-	need net codasrv
-}
-
-checkconfig() {
-	if [ ! -e /var/lib/vice/hostname ] ; then
-		eerror "Please set up vice before starting the service..."
-		return 1
-	fi
+	need net
 }
 
 start() {
@@ -25,6 +18,6 @@ start() {
 stop() {
 	ebegin "Stopping venus"
 	start-stop-daemon --stop --quiet --exec /usr/sbin/venus
-	umount -l /mnt/coda &>/dev/null
+	umount -l coda &>/dev/null
 	eend $?
 }