From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QmFmj-0005A1-Cg for garchives@archives.gentoo.org; Thu, 28 Jul 2011 01:53:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B534F21C0FF; Thu, 28 Jul 2011 01:53:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8258421C0FF for ; Thu, 28 Jul 2011 01:53:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C52631B4011 for ; Thu, 28 Jul 2011 01:53:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2332F8003D for ; Thu, 28 Jul 2011 01:53:03 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: <4186feac966e2d1bf32f55282581a7a1d2810e3b.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:webui commit in: / X-VCS-Repository: proj/gentoaster X-VCS-Files: create_image.sh X-VCS-Directories: / X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: 4186feac966e2d1bf32f55282581a7a1d2810e3b Date: Thu, 28 Jul 2011 01:53:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c24d51dd61198e41c7c8024261743afd commit: 4186feac966e2d1bf32f55282581a7a1d2810e3b Author: Liam McLoughlin hexxeh net> AuthorDate: Thu Jul 28 01:52:53 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Thu Jul 28 01:52:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D4186feac 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 tes= ting 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 "Er= ror copying cached kernel modules" + cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying c= ached kernel" + cp ${TOOL_RES_PATH}/initrd boot/initrd || handle_error "Error copying c= ached initrd" + cp -R ${TOOL_RES_PATH}/modules/* lib/modules/ || handle_error "Error co= pying 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} || hand= le_error "Error installing extlinux" dd if=3D/usr/lib/extlinux/mbr.bin of=3D../${IMAGE_NAME} conv=3Dnotrunc &= >> ${LOG_FILE} || handle_error "Error copying extlinux MBR" cp ${TOOL_RES_PATH}/extlinux.conf boot/ || handle_error "Error copying e= xtlinux 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