[gentoo-commits] proj/gentoaster:webui commit in: /

["Liam McLoughlin" <hexxeh@hexxeh.net>]

commit:     4186feac966e2d1bf32f55282581a7a1d2810e3b
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Thu Jul 28 01:52:53 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Thu Jul 28 01:52:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=4186feac

Add initrd support for cached kernels

---
 create_image.sh |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/create_image.sh b/create_image.sh
index cc4e366..5052202 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -207,8 +207,9 @@ echo "Step 17: Setting up kernel"
 # If we got the flag, used a cached kernel to reduce build times for testing
 if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then
 	echo "Using cached kernel" &>> ${LOG_FILE}
-	cp ${TOOL_RES_PATH}/bzImage boot/kernel || handle_error "Error copying cached kernel"
-	cp -R ${TOOL_RES_PATH}/kernelmodules/* lib/modules/ || handle_error "Error copying cached kernel modules"
+	cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying cached kernel"
+	cp ${TOOL_RES_PATH}/initrd boot/initrd || handle_error "Error copying cached initrd"
+	cp -R ${TOOL_RES_PATH}/modules/* lib/modules/ || handle_error "Error copying cached kernel modules"
 else
 	echo "Downloading/installing kernel sources" &>> ${LOG_FILE}
 	linux32 chroot . emerge gentoo-sources &>> ${LOG_FILE} || handle_error "Error emerging kernel sources"
@@ -256,6 +257,9 @@ echo "Step 22: Installing extlinux"
 extlinux --heads 255 --sectors 63 --install boot &>> ${LOG_FILE} || handle_error "Error installing extlinux"
 dd if=/usr/lib/extlinux/mbr.bin of=../${IMAGE_NAME} conv=notrunc &>> ${LOG_FILE} || handle_error "Error copying extlinux MBR"
 cp ${TOOL_RES_PATH}/extlinux.conf boot/ || handle_error "Error copying extlinux configuration"
+if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then
+	echo -e "\tinitrd initrd" >> boot/extlinux.conf || handle_error "Error adding initrd to bootloader"
+fi
 cd  ..
 cleanup_mounts
 case "${OUTPUT_FORMAT}" in