summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files/boot/disk
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-09-28 17:53:19 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-09-28 17:53:19 +0000
commite238e81866ba6f5183c0baedb981e78b96b89e89 (patch)
tree49a24d364a5edbae636c05cc4064475bddcd4676 /packages/slugos-init/files/boot/disk
parentebed5320160e3629522ff7a5498e66724eada3f0 (diff)
parent0846c33022e583c178c20cf328a7c53fa7f881ab (diff)
merge of '600d1cf340e547dc05390af836d52bb279ef2e25'
and 'd3f331b70e95906af0d505b077734594ec371fee'
Diffstat (limited to 'packages/slugos-init/files/boot/disk')
-rw-r--r--packages/slugos-init/files/boot/disk19
1 files changed, 6 insertions, 13 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index 02b8ee82cf..dca1e422aa 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -8,22 +8,10 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin
#
# Load the helper functions
. /etc/default/functions
+. /etc/default/modulefunctions
#
leds boot system
#
-# Load the required SCSI and USB modules 'by hand'
-insmod /lib/modules/`uname -r`/kernel/drivers/scsi/scsi_mod.ko
-insmod /lib/modules/`uname -r`/kernel/drivers/scsi/sd_mod.ko
-insmod /lib/modules/`uname -r`/kernel/drivers/usb/core/usbcore.ko
-# Add more cases here for different boards
-case "$(machine)" in
- nslu2)
- insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ehci-hcd.ko
- insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ohci-hcd.ko
- ;;
-esac
-insmod /lib/modules/`uname -r`/kernel/drivers/usb/storage/usb-storage.ko
-#
if test -n "$1"
then
device="$1"
@@ -35,6 +23,11 @@ then
#
# proc is needed for UUID mount
mount -t proc proc /proc
+ #
+ # load USB & SCSI storage modules (/proc required!)
+ echo "boot: loading modules required for boot"
+ loaddiskmods
+ #
# Mount read-write because before exec'ing init
# If a UUID is given (in the environment) this
# is used in preference to the device, but if