rpms/coda/devel coda-6.9.4-kill-modulesconf.patch, NONE, 1.1 coda.spec, 1.17, 1.18

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/coda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3424

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-kill-modulesconf.patch 
Log Message:
* Thu Sep 17 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-8
- Patch venus-setup.in to remove unnecessary modules.conf stuff


coda-6.9.4-kill-modulesconf.patch:
 venus-setup.in |   60 ---------------------------------------------------------
 1 file changed, 60 deletions(-)

--- NEW FILE coda-6.9.4-kill-modulesconf.patch ---
diff -ur coda-6.9.4~/coda-src/scripts/venus-setup.in coda-6.9.4/coda-src/scripts/venus-setup.in
--- coda-6.9.4~/coda-src/scripts/venus-setup.in	2009-09-17 15:39:03.535004437 -0400
+++ coda-6.9.4/coda-src/scripts/venus-setup.in	2009-09-17 15:40:10.144003377 -0400
@@ -131,66 +131,6 @@
 	grep "$2" "$1" > /dev/null 2>&1
 }
 
-# tell the kernel about the new module 
-if [ X$OS = XLinux ] ; then
-    # make sure the module dependencies are current
-    /sbin/depmod -a
-    # udev managed /dev
-    if [ -d /dev/.udevdb -o -f /dev/.udev.tdb ] ; then
-	# udev relies on modules being autoloaded because their hardware got
-	# detected. But since there is no hardware for the Coda kernel module
-	# we have to make sure it is loaded automatically at boot
-
-	# FC3
-	if contains /etc/rc.sysinit /etc/rc.modules ; then
-	    if [ ! -f /etc/rc.modules ] ; then
-		echo "#!/bin/sh" > /etc/rc.modules
-		chmod 755 /etc/rc.modules
-	    fi
-	    if ! contains /etc/rc.modules coda ; then
-		echo "/sbin/modprobe coda" >> /etc/rc.modules
-	    fi
-
-	# debian
-	elif ! contains /etc/modules coda ; then
-	    echo "=> Adding 'coda' to /etc/modules so that the kernel module is"
-	    echo "   loaded automatically whenever the system boots"
-	    echo coda >> /etc/modules
-	fi
-	# since we aren't booting this time, make sure the module is loaded
-	echo "== Loading coda kernel module."
-	/sbin/modprobe coda && sleep 5
-    fi
-    # devfs managed /dev
-    if [ -d /etc/devfs ] ; then
-	if ! contains /etc/devfs/devices cfs0 ; then
-	    echo "=> Adding 'cfs0' to /etc/devfs/devices so that devfs creates"
-	    echo "   an entry for /dev/cfs0 so that the Coda kernel module"
-	    echo "   can be autoloaded when the /dev/cfs0 or /dev/coda/0"
-	    echo "   device is accessed"
-	    echo "cfs0 c 67 0 root root 0200" >> /etc/devfs/devices
-	    /etc/init.d/devfsd restart
-	fi
-    fi
-    # static /dev
-    if /sbin/modinfo -V | grep modutils > /dev/null || [ -z $(/sbin/modinfo -F alias coda) ] ; then
-	# kernel module does not encode an alias for us
-	if [ -f /etc/modules.conf ] ; then
- 	    MODULES=/etc/modules.conf
-	else
-	    MODULES=/etc/conf.modules
-	fi
-	if ! contains $MODULES coda ; then
-	    echo "=> Adding aliases to $MODULES so that modprobe can"
-	    echo "   handle autoloading of the Coda kernel module when"
-	    echo "   /dev/cfs0 is accessed"
-	    echo >> $MODULES
-	    echo 'alias char-major-67 coda' >> $MODULES
-	    echo 'alias /dev/coda coda' >> $MODULES
-	fi
-    fi
-fi
-
 if [ $OS = CYGWI ]; then
 
   # setup the drive mapping


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/devel/coda.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- coda.spec	9 Sep 2009 14:25:13 -0000	1.17
+++ coda.spec	17 Sep 2009 19:43:45 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           coda
 Version:        6.9.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -16,6 +16,7 @@ Patch2:         coda-6.9.4-rc2-kernel-al
 Patch3:         coda-6.9.4-gcc44.patch
 Patch4:         coda-configure.patch
 Patch5:         coda-6.9.4-sname-fault.patch
+Patch6:         coda-6.9.4-kill-modulesconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel >= 2.5
 BuildRequires:  rpc2-devel >= 2.8
@@ -102,6 +103,9 @@ system client.
 #sname overflows
 %patch5 -p1
 
+# totally unnecessary with our init script
+%patch6 -p1
+
 %build
 # note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et"
@@ -311,6 +315,9 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Adam Goode <adam at spicenitz.org> - 6.9.4-8
+- Patch venus-setup.in to remove unnecessary modules.conf stuff
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.9.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild