[gentoo-commits] gentoo-x86 commit in net-nds/portmap/files: portmap.rc6

[Mike Frysinger (vapier)]

vapier      09/05/30 20:50:39

  Modified:             portmap.rc6
  Log:
  Add check for SUNRPC_REGISTER_V4=y in kernel config.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 net-nds/portmap/files/portmap.rc6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/portmap/files/portmap.rc6?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/portmap/files/portmap.rc6?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/portmap/files/portmap.rc6?r1=1.12&r2=1.13

Index: portmap.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- portmap.rc6	13 Jun 2007 07:52:44 -0000	1.12
+++ portmap.rc6	30 May 2009 20:50:39 -0000	1.13
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.12 2007/06/13 07:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.13 2009/05/30 20:50:39 vapier Exp $
 
 depend() {
 	use net
@@ -9,7 +9,20 @@
 	before xinetd
 }
 
+checkconfig() {
+	if [ -e /proc/config.gz ] ; then
+		if zcat /proc/config.gz | grep -s SUNRPC_REGISTER_V4=y ; then
+			eerror "portmap does not work with SUNRPC_REGISTER_V4=y;"
+			eerror "disable it or use the net-nds/rpcbind package."
+			return 1
+		fi
+	fi
+	return 0
+}
+
 start() {
+	checkconfig || return 1
+
 	ebegin "Starting portmap"
 	start-stop-daemon --start --quiet --exec /sbin/portmap -- ${PORTMAP_OPTS}
 	local ret=$?