Added multilib cdboot patch.

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

generic/initrd.defaults

@@ -60,7 +60,7 @@ then
 fi
 
 QUIET=1
-ROOT_LINKS='bin sbin lib lib64 boot usr opt'
+ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt'
 ROOT_TREES='etc root home var'
 INSMOD='insmod'
 if [ "${KMINOR}" -gt '4' ]

generic/linuxrc

@@ -474,6 +474,10 @@ then
 		# Now we do the links.
 		for x in ${ROOT_LINKS}
 		do
+			if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]
+			then
+				ln -s "`readlink ${NEW_ROOT}/${FS_LOCATION}/${x}`" "${x}" 2>/dev/null
+			else
 				# List all subdirectories of x
 				for directory in `find "${NEW_ROOT}/${FS_LOCATION}/${x}" -type d 2>/dev/null`
 				do
@@ -481,8 +485,8 @@ then
 					directory=${directory#${NEW_ROOT}/${FS_LOCATION}/}
 
 					## Skip this directory if we already linked a parent directory
-				if [ "${current_parrent}" != '' ]; then
+					if [ "${curent_parrent}" != '' ]; then
-					var=`echo "${directory}" | grep "^${current_parrent}"`
+						var=`echo "${directory}" | grep "^${curent_parrent}"`
 						if [ "${var}" != '' ]; then
 							continue
 						fi
@@ -499,10 +503,11 @@ then
 						done
 					else
 						# It does not exist, make a link to the livecd
-					ln -s "/${FS_LOCATION}/${directory}" "${directory}" 2> /dev/null
+						ln -s "/${FS_LOCATION}/${directory}" "${directory}" 2>/dev/null
-					current_parrent=${directory}
+						current_parent=${directory}
 					fi
 				done
+			fi
 		done
 
 		mkdir initrd proc tmp sys