summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--mkinitramfs4
-rw-r--r--scripts/functions8
3 files changed, 18 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index dfdbc50..07d6a4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+initramfs-tools (0.12) breezy; urgency=low
+
+ * 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
+
+ -- Jeff Bailey <jbailey@ubuntu.com> Mon, 20 Jun 2005 23:05:04 +0000
+
initramfs-tools (0.11) breezy; urgency=low
"Illusion is the first of all pleasures" - Oscar Wilde
diff --git a/mkinitramfs b/mkinitramfs
index 8ef22c4..f06811e 100644
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -51,7 +51,7 @@ auto_add_modules()
copy_modules_dir kernel/fs/xfs
# These aren't caught by the above but really need to be there:
- for x in mbcache nfs af_packet; do
+ for x in mbcache nfs af_packet raid1; do
for y in $(modprobe --set-version=${version} --show-depends ${x} | awk '{ print $2 }'); do
# Prune duplicates
if [ -e ${TMPDIR}/${y} ]; then
@@ -186,6 +186,8 @@ ln -s /usr/lib/initramfs-tools/bin/busybox ${TMPDIR}/bin/busybox
ln -s /sbin/modprobe ${TMPDIR}/sbin
ln -s /sbin/depmod ${TMPDIR}/sbin
ln -s /sbin/rmmod ${TMPDIR}/sbin
+mkdir -p ${TMPDIR}/etc/modprobe.d
+ln -s /etc/modprobe.d/aliases ${TMPDIR}/etc/modprobe.d
# Raid
ln -s /sbin/mdadm ${TMPDIR}/sbin
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
}