If we have a raid456.ko module, we need to create a raid45.ko symlink since dmraid...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@610 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 6c4e0b0dab0a710b6564326e69deba97acf3ea50..ad37e55f32e9bdc13cf957879a15175360182854 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh:
+  If we have a raid456.ko module, we need to create a raid45.ko symlink since
+  dmraid can be rather stupid. This should resolve bug #195804.
+
   04 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> sparc64/kernel-config,
   alpha/kernel-config-2.6, ia64/kernel-config-2.6, x86/kernel-config-2.6,
   x86_64/kernel-config-2.6:

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index e80213add54a620d5154a8f885646927f4d2ca3a..a9ee20f007c6a3bf6af608fe007b1a7255736d24 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -101,6 +101,13 @@ append_dmraid(){
        /bin/tar -jxpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" ||
                gen_die "Could not extract dmraid binary cache!";
        cd "${TEMP}/initramfs-dmraid-temp/"
+       RAID456=`find . -type f -name raid456.ko`
+       if [ -n "${RAID456}" ]
+       then
+               cd "${RAID456/raid456.ko/}"
+               ln -sf raid456.kp raid45.ko
+               cd "${TEMP}/initramfs-dmraid-temp/"
+       fi
        find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
        rm -r "${TEMP}/initramfs-dmraid-temp/"
 }