[Fai-commit] r4981 - in trunk: bin examples/simple/class

[lange at alioth.debian.org]

Author: lange
Date: 2008-06-13 13:41:46 +0000 (Fri, 13 Jun 2008)
New Revision: 4981

Modified:
   trunk/bin/setup-storage
   trunk/examples/simple/class/20-hwdetect.source
Log:
move loading of kernel modules into 20hwdetect.source


Modified: trunk/bin/setup-storage
===================================================================
--- trunk/bin/setup-storage	2008-06-13 12:20:12 UTC (rev 4980)
+++ trunk/bin/setup-storage	2008-06-13 13:41:46 UTC (rev 4981)
@@ -117,13 +117,9 @@
 &FAI::get_current_disks;
 
 # see whether there are any existing LVMs
-# load the dm-mod module first, otherwise the LVM tools won't work
-`modprobe dm-mod`;
 &FAI::get_current_lvm;
 
 # see whether there are any existing RAID devices
-# load the md-mod module first, otherwise there is nothing that can be detected
-`modprobe md-mod`;
 &FAI::get_current_raid;
 
 # debugging only: print the current configuration
@@ -168,9 +164,6 @@
 $FAI::debug and print "$_:" . $FAI::commands{$_}{cmd} . "\n" foreach (&numsort(keys %FAI::commands));
 
 # run the commands (if $FAI::no_dry_run is set)
-# load the modules to support encryption
-`modprobe aes`;
-`modprobe dm-crypt`;
 &FAI::execute_command($FAI::commands{$_}{cmd}) foreach (&numsort(keys %FAI::commands));
 
 # generate the proposed fstab contents

Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source	2008-06-13 12:20:12 UTC (rev 4980)
+++ trunk/examples/simple/class/20-hwdetect.source	2008-06-13 13:41:46 UTC (rev 4981)
@@ -26,7 +26,7 @@
 kernelmodules="rtc usbkbd ide-disk ide-cd"
 case $(uname -r) in
     2.4*) kernelmodules="$kernelmodules keybdev mousedev hid ide-detect isa-pnp" ;;
-    2.6*) kernelmodules="$kernelmodules ehci-hcd ohci-hcd uhci-hcd usbhid usbmouse ide-generic mptspi ata_piix" ;;
+    2.6*) kernelmodules="$kernelmodules ehci-hcd ohci-hcd uhci-hcd usbhid usbmouse ide-generic mptspi ata_piix dm-mod md-mod aes dm-crypt" ;;
 
 esac