[gentoo-commits] proj/sci:master commit in: net-fs/cvmfs/files/, net-fs/cvmfs/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     b43872551e20fd5c15948f5c51bb3feae41df080
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Jul 25 18:09:19 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 18:09:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b4387255

net-fs/cvmfs: fixed client init and setup, added config stage

(Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 net-fs/cvmfs/ChangeLog                       |    4 ++++
 net-fs/cvmfs/cvmfs-2.0.18.ebuild             |   24 ++++++++++++++++++++++--
 net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch |    2 +-
 net-fs/cvmfs/files/cvmfs.initd               |    2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/net-fs/cvmfs/ChangeLog b/net-fs/cvmfs/ChangeLog
index 3dc9d74..30b13a0 100644
--- a/net-fs/cvmfs/ChangeLog
+++ b/net-fs/cvmfs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> cvmfs-2.0.18.ebuild,
+  files/cvmfs-2.0.18-openrc.patch, files/cvmfs.initd:
+  net-fs/cvmfs: fixed client init and setup, added config stage
+
 *cvmfs-2.0.18 (25 Jul 2012)
 
   25 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +cvmfs-2.0.18.ebuild,

diff --git a/net-fs/cvmfs/cvmfs-2.0.18.ebuild b/net-fs/cvmfs/cvmfs-2.0.18.ebuild
index 0ce39f4..c84a8ff 100644
--- a/net-fs/cvmfs/cvmfs-2.0.18.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.0.18.ebuild
@@ -32,8 +32,9 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
-# needs to be either client or server
-REQUIRED_USE="!server? ( client )"
+
+# either client or server is required and are mutually exclusive
+REQUIRED_USE="^^ ( client server )"
 
 pkg_setup() {
 	if use server && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp
@@ -102,3 +103,22 @@ pkg_postinst() {
 pkg_postrm() {
 	use server && linux-mod_pkg_postrm
 }
+
+pkg_config() {
+	if use client; then
+		einfo "Setting up CernVM-FS client"
+		cvmfs_config setup
+		cat > ${EROOT}/etc/cvmfs/default.local <<-EOF
+			# Repositories to fetch example is for ATLAS
+			CVMFS_REPOSITORIES=atlas.cern.ch,atlas-condb.cern.ch,grid.cern.ch
+			# Local proxy settings, ex: http://cernvm.cern.ch/config/proxy.cgi
+			CVMFS_HTTP_PROXY="DIRECT"
+			# Where to keep the cvmfs cache
+			CVMFS_CACHE_BASE=${EROOT}/var/scratch/cvmfs
+			# Quota limit in Mb
+			CVMFS_QUOTA_LIMIT=10000
+		EOF
+		einfo "Now edit ${EROOT}/etc/cvmfs/default.local and run"
+		einfo "  ${EROOT}/usr/init.d/cvmfs restart"
+	fi
+}

diff --git a/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch b/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch
index bf6eb9a..df1f5e6 100644
--- a/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch
+++ b/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch
@@ -11,7 +11,7 @@ diff -Nur cvmfs-2.0.18.orig/cvmfs/src/cvmfs_config cvmfs-2.0.18/cvmfs/src/cvmfs_
    # Ubuntu
    service="/usr/sbin/service"
 +  chkconfig="/usr/sbin/chkconfig"
-+elif [ -x /usr/sbin/rc-service ]; then
++elif [ -x /sbin/rc-service ]; then
 +  # OpenRC
 +  service="/sbin/rc-service"
 +  chkconfig="/usr/bin/rc-config"

diff --git a/net-fs/cvmfs/files/cvmfs.initd b/net-fs/cvmfs/files/cvmfs.initd
index 80cf374..75f45b7 100644
--- a/net-fs/cvmfs/files/cvmfs.initd
+++ b/net-fs/cvmfs/files/cvmfs.initd
@@ -110,7 +110,7 @@ start() {
 }
 
 stop() {
-    local m ret
+    local m ret=0
     # FIXME: do we need to unmount here or?
     for m in $(list_mounts | awk '{print $3}');  do	
 	ebegin "Unmounting ${m}"