rpms/module-init-tools/devel module-init-tools.spec, 1.29, 1.30 weak-modules, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28500

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
fixes



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- module-init-tools.spec	30 Jul 2006 08:12:37 -0000	1.29
+++ module-init-tools.spec	31 Jul 2006 01:45:11 -0000	1.30
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.4
+Release: 0.pre1.4.5
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,10 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.5
+- Don't call depmod on removing a kernel.
+- Warn rather than exit if we can't process weak-updates on new kernel
+
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.4
 - Don't call mkinitrd when removing a kernel.
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- weak-modules	30 Jul 2006 08:12:39 -0000	1.3
+++ weak-modules	31 Jul 2006 01:45:11 -0000	1.4
@@ -332,8 +332,12 @@
 	check_compatibility(modules,kernels,compatibles)
 
 	if not compatibles.has_key(kernel):
-		print "Cannot locate data on installed kernel!"
-		sys.exit(1)
+		print "**** weak-modules did not process this kernel ****"
+		print "weak-updates links not updated for " + kernel
+		print "Please run /sbin/weak-modules --add-kernel `uname -r`"
+		print "in order to update kernel module compatibility links."
+		# Don't error this result because the above warning is enough.
+		sys.exit(0)
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
 	for module in range(0,len(compatibles[kernel])):
@@ -387,9 +391,7 @@
 		if dry_run == "no":
 			os.system("rm -f " + module)
 			os.system("rmdir " + weak_dir)
-			run_depmod(kernel)
-			#kernel removed so no need to rerun mkinitrd
-			#run_mkinitrd(kernel)
+			#kernel removed so no need to rerun mkinitrd or depmod
 	
 
 if __name__ == "__main__":