[Fai-commit] r5604 - in trunk: debian examples/simple/class

[Thomas Lange]

Author: lange
Date: 2009-10-27 15:29:38 +0000 (Tue, 27 Oct 2009)
New Revision: 5604

Modified:
   trunk/debian/changelog
   trunk/examples/simple/class/20-hwdetect.source
Log:
20-hwdetect.source: remove modules not needed any more, cleanup code

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-27 15:17:44 UTC (rev 5603)
+++ trunk/debian/changelog	2009-10-27 15:29:38 UTC (rev 5604)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta30) unstable; urgency=low
+fai (3.2.23~beta31) unstable; urgency=low
 
   [ Thomas Lange ]
   * NEWS: add hint about missing packages in nfsroot, changes in
@@ -69,6 +69,7 @@
   * LAST/50-misc: use ainsl instead of echo
   * 20-hwdetect.source, DEMO/10-misc,10-conffiles: apply patch from
     Michael, that skips some commands on softupdate (closes: #481871)
+  * 20-hwdetect.source: remove modules not needed any more, cleanup code
   * install_packages: do not call AptPkg function when -N was given
     write list of all packages to packages.list
     fix code that sets action if smarti is used, minor code cleanup,

Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source	2009-10-27 15:17:44 UTC (rev 5603)
+++ trunk/examples/simple/class/20-hwdetect.source	2009-10-27 15:29:38 UTC (rev 5604)
@@ -12,7 +12,7 @@
 # load all IDE drivers
 
 # DMA does not work if we load all modules in drivers/ide, so only try pci modules
-mod=$(find /lib/modules/$(uname -r)/kernel/drivers/ide/pci -type f | sed 's/\.o$//' | sed 's/\.ko$//' | sed 's/.*\///')
+mod=$(find /lib/modules/$(uname -r)/kernel/drivers/ide/pci -type f | sed 's/\.ko$//' | sed 's/.*\///')
 for i in $mod; do
     modprobe $i 1>/dev/null 2>&1
 done
@@ -21,11 +21,10 @@
     [ -d $d ] && echo "using_dma:1" > $d/settings
 done
 
-# load additional kernel modules (from old 11modules.source)
-# this order should also enable DMA for all IDE drives
-kernelmodules="usbkbd ide-disk ide-cd"
+# load additional kernel modules
+kernelmodules="usbkbd ide-disk"
 case $(uname -r) in
-    2.6*) kernelmodules="$kernelmodules ohci-hcd usbhid usbmouse ide-generic mptspi ata_piix dm-mod md-mod aes dm-crypt" ;;
+    2.6*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;;
 esac
 
 for mod in $kernelmodules; do