[Lunar-commits] CVS: moonbase/utils/module-init-tools BUILD, 1.11, 1.12

[Veerappan]

Update of /var/cvs/lunar/moonbase/utils/module-init-tools
In directory dbguin.lunar-linux.org:/tmp/cvs-serv10718

Modified Files:
	BUILD 
Log Message:
cleaned up module-init-tools to work without modutils installed.  for 
those of us running only the 2.6.x kernel.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/module-init-tools/BUILD,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- BUILD	29 Feb 2004 17:51:53 -0000	1.11
+++ BUILD	10 Mar 2004 06:31:09 -0000	1.12
@@ -7,14 +7,19 @@
                --mandir=/usr/share/man  \
 	       --prefix=/		&&
   make                                  &&
+  if module_installed modutils; then
+  	make moveold
+  fi 					&& 
+  if module_installed modutils && [ ! -e /etc/modprobe.conf ]; then
+	echo generating modprobe.conf
+	./generate-modprobe.conf /etc/modprobe.conf
+  fi 					&&
+
+
   prepare_install                       &&
   install -m0644 modprobe.devfs /etc    &&
 
-  make moveold                          &&
   make install                          &&
-  if [ ! -e /etc/modprobe.conf ]; then
-  ./generate-modprobe.conf /etc/modprobe.conf
-  fi                                    &&
   if [ ! -d /etc/sysconfig ]; then
      install -m0700 $SCRIPT_DIRECTORY/init.d/modutils /etc/init.d
      ln -sf ../init.d/modutils /etc/rcS.d/S20modutils