summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJeff Bailey <jbailey@ubuntu.com>2005-06-20 23:05:53 +0000
committerJeff Bailey <jbailey@ubuntu.com>2005-06-20 23:05:53 +0000
commita137627150b76d48d96ef72d26915005a1ce8538 (patch)
tree92a94cb977a1496f69bfe374d624f650127c1f53 /scripts
parentb22f2c7fc49c9874eb8f2df1d8b1fabec540cfb0 (diff)
downloadinitramfs-tools-a137627150b76d48d96ef72d26915005a1ce8538.tar.gz
initramfs-tools-a137627150b76d48d96ef72d26915005a1ce8538.zip
* Don't complain if /etc/mkinitramfs/modules doesn't exist.
* Make sure that raid1 is pulled in. * Include /etc/modprobe.d/aliases in the initramfs
Diffstat (limited to 'scripts')
-rw-r--r--scripts/functions8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/functions b/scripts/functions
index ab23352..73b773a 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -127,7 +127,9 @@ load_modules()
# Load the modules
# FIXME - do module options here
- for x in $(cat /conf/modules); do
- modprobe -v $x
- done
+ if [ -e /conf/modules ]; then
+ for x in $(cat /conf/modules); do
+ modprobe -v $x
+ done
+ fi
}