Revision: 2852
http://ipcop.svn.sourceforge.net/ipcop/?rev=2852&view=rev
Author: owes
Date: 2009-05-13 19:08:46 +0000 (Wed, 13 May 2009)
Log Message:
-----------
/etc/modules.conf is a config file for module-init-tools
Better to use /etc/modules consistently for a list of modules to load
Add loading /etc/modules in rc.sysinit later, here we can check for comments
etc. since we have all our tools in place.
Modified Paths:
--------------
ipcop/trunk/config/install/init
ipcop/trunk/config/rootfiles/common/stage2
ipcop/trunk/lfs/initramfs
ipcop/trunk/src/scripts/mkinitramfs
Added Paths:
-----------
ipcop/trunk/config/etc/modules
ipcop/trunk/config/install/modules
Removed Paths:
-------------
ipcop/trunk/config/install/modules.conf
Added: ipcop/trunk/config/etc/modules
===================================================================
--- ipcop/trunk/config/etc/modules (rev 0)
+++ ipcop/trunk/config/etc/modules 2009-05-13 19:08:46 UTC (rev 2852)
@@ -0,0 +1,5 @@
+# /etc/modules: kernel modules loaded early in rc.sysinit.
+#
+# This file contains the names of kernel modules that should be loaded
+# at boot time, one per line. Lines beginning with "#" are ignored.
+
Modified: ipcop/trunk/config/install/init
===================================================================
--- ipcop/trunk/config/install/init 2009-05-13 19:02:56 UTC (rev 2851)
+++ ipcop/trunk/config/install/init 2009-05-13 19:08:46 UTC (rev 2852)
@@ -272,8 +272,8 @@
syslogd -O /dev/tty4
test_ok
-# We store all needed modules in /etc/modules.conf so we don't hardcode any
modules here
-for MODULE in `cat /etc/modules.conf`; do
+# We store all needed modules in /etc/modules so we don't hardcode any modules
here
+for MODULE in `cat /etc/modules`; do
echo -ne "Loading module ${MODULE} ... "
/sbin/modprobe ${MODULE}
test_ok
Copied: ipcop/trunk/config/install/modules (from rev 2848,
ipcop/trunk/config/install/modules.conf)
===================================================================
--- ipcop/trunk/config/install/modules (rev 0)
+++ ipcop/trunk/config/install/modules 2009-05-13 19:08:46 UTC (rev 2852)
@@ -0,0 +1,4 @@
+ehci-hcd
+ohci-hcd
+uhci-hcd
+usbhid
Property changes on: ipcop/trunk/config/install/modules
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: ipcop/trunk/config/install/modules.conf
===================================================================
--- ipcop/trunk/config/install/modules.conf 2009-05-13 19:02:56 UTC (rev
2851)
+++ ipcop/trunk/config/install/modules.conf 2009-05-13 19:08:46 UTC (rev
2852)
@@ -1,4 +0,0 @@
-ehci-hcd
-ohci-hcd
-uhci-hcd
-usbhid
Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2 2009-05-13 19:02:56 UTC (rev
2851)
+++ ipcop/trunk/config/rootfiles/common/stage2 2009-05-13 19:08:46 UTC (rev
2852)
@@ -17,6 +17,7 @@
etc/logrotate.conf.FLASH
etc/logrotate.conf.HDD
etc/mime.types
+etc/modules
etc/modules.conf
etc/mtab
etc/nsswitch.conf
Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs 2009-05-13 19:02:56 UTC (rev 2851)
+++ ipcop/trunk/lfs/initramfs 2009-05-13 19:08:46 UTC (rev 2852)
@@ -414,8 +414,8 @@
# Just a stupid flag file
echo $(MACHINE) > $(FLOPPY_ROOT_DIR)/FLOPPYBOOT
- # Empty out /etc/modules.conf because the mini-initramfs has only very
few kernel modules
- cat /dev/null > $(FLOPPY_ROOT_DIR)/etc/modules.conf
+ # Empty out /etc/modules because the mini-initramfs has only very few
kernel modules
+ cat /dev/null > $(FLOPPY_ROOT_DIR)/etc/modules
# Copy libraries
mkdir -p $(FLOPPY_ROOT_DIR)/lib
Modified: ipcop/trunk/src/scripts/mkinitramfs
===================================================================
--- ipcop/trunk/src/scripts/mkinitramfs 2009-05-13 19:02:56 UTC (rev 2851)
+++ ipcop/trunk/src/scripts/mkinitramfs 2009-05-13 19:08:46 UTC (rev 2852)
@@ -226,8 +226,8 @@
fi
fi
- # Start with a clean modules.conf
- rm -fr ${TMPDIR}/etc/modules.conf
+ # Start with a clean /etc/modules
+ rm -fr ${TMPDIR}/etc/modules
# Create the modules directory
mkdir -p ${TMPDIR}/lib/modules/${KVER}/kernel
@@ -249,7 +249,7 @@
if ! cp -a ${i} ${TMPDIR}/$(dirname ${i})/$(basename ${i}); then
exiterror 128 "Couldn't copy module ${i}"
else
- echo "$(basename ${i} .ko)" >> ${TMPDIR}/etc/modules.conf
+ echo "$(basename ${i} .ko)" >> ${TMPDIR}/etc/modules
fi
done
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
