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 1QTMns-0000Ge-VI for garchives@archives.gentoo.org; Sun, 05 Jun 2011 23:32:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C0331C026; Sun, 5 Jun 2011 23:32:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2A35C1C017 for ; Sun, 5 Jun 2011 23:32:13 +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 5931D2AC055 for ; Sun, 5 Jun 2011 23:32:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 765308003C for ; Sun, 5 Jun 2011 23:32:11 +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: <4d2593cdefcdc24edd46d2e28a8dd4d38769501d.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:master 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: 4d2593cdefcdc24edd46d2e28a8dd4d38769501d Date: Sun, 5 Jun 2011 23:32:11 +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: 47226bb25cbef09cc72b102d754a04c0 commit: 4d2593cdefcdc24edd46d2e28a8dd4d38769501d Author: Liam McLoughlin hexxeh net> AuthorDate: Sat Jun 4 17:01:12 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Sat Jun 4 17:01:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D4d2593cd Fixed offset but now mounting fails --- create_image.sh | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/create_image.sh b/create_image.sh index e403df9..61ab9e7 100755 --- a/create_image.sh +++ b/create_image.sh @@ -4,7 +4,7 @@ IMAGE_BASENAME=3D"${1}" IMAGE_NAME=3D"${IMAGE_BASENAME}.image" IMAGE_OUT=3D"${IMAGE_BASENAME}.vdi" BOOT_MEGABYTES=3D64 -SWAP_MEGABYTES=3D512 +SWAP_MEGABYTES=3D128 IMAGE_MEGABYTES=3D"${2}" IMAGE_BYTES=3D$(( ${IMAGE_MEGABYTES} * 1024 * 1024 )) TIMEZONE=3D"Europe/London" @@ -33,7 +33,7 @@ umount -d rootfs/dev &>> ${LOG_FILE} umount -d rootfs/proc &>> ${LOG_FILE} umount -d rootfs/boot &>> ${LOG_FILE} umount -d rootfs &>> ${LOG_FILE} -#losetup -d ${LOOP_DEV_ROOT} +losetup -d ${LOOP_DEV_ROOT} } cleanup_mounts =20 @@ -43,10 +43,10 @@ echo -e "\x55\xaa" | dd bs=3D1 count=3D2 seek=3D510 o= f=3D${IMAGE_NAME} conv=3Dnotrunc &>> LOOP_DEV_IMAGE=3D`losetup -f` losetup ${LOOP_DEV_IMAGE} ${IMAGE_NAME} &>> ${LOG_FILE} =20 -sfdisk ${LOOP_DEV_IMAGE} -uM &>> ${LOG_FILE} << EOF +sfdisk ${LOOP_DEV_IMAGE} -H64 -S32 &>> ${LOG_FILE} << EOF 1,${BOOT_MEGABYTES},83,* -,${SWAP_MEGABYTES},82,- -,,83,- +$(( 1+ ${BOOT_MEGABYTES} )),${SWAP_MEGABYTES},82,- +$(( 1+ ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} )),,83,- EOF sleep 2 losetup -d ${LOOP_DEV_IMAGE} @@ -55,19 +55,19 @@ losetup -d ${LOOP_DEV_IMAGE} echo "Creating filesystems" =20 LOOP_DEV_BOOT=3D`losetup -f` -losetup -o 512 ${LOOP_DEV_BOOT} ${IMAGE_NAME} +losetup -o $(( 512 * 2048 )) ${LOOP_DEV_BOOT} ${IMAGE_NAME} mkfs -t ext2 ${LOOP_DEV_BOOT} &>> ${LOG_FILE} sleep 2 losetup -d ${LOOP_DEV_BOOT} =20 LOOP_DEV_ROOT=3D`losetup -f` -losetup -o $(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + ( ${SWAP_MEG= ABYTES} * 1024 * 1024 ) )) ${LOOP_DEV_ROOT} ${IMAGE_NAME} +losetup -o $(( ( 512 * 2048 ) + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + (= ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${LOOP_DEV_ROOT} ${IMAGE_NAME} mkfs -t ext3 ${LOOP_DEV_ROOT} &>> ${LOG_FILE} #sleep 2 #losetup -d ${LOOP_DEV_ROOT} =20 LOOP_DEV_SWAP=3D`losetup -f` -losetup -o $(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) )) ${LOOP_DEV_S= WAP} ${IMAGE_NAME} +losetup -o $(( ( 512 * 2048 ) + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) )) $= {LOOP_DEV_SWAP} ${IMAGE_NAME} mkswap ${LOOP_DEV_SWAP} &>> ${LOG_FILE} sleep 2=20 losetup -d ${LOOP_DEV_SWAP} @@ -76,10 +76,10 @@ echo "Mounting fileystems" =20 echo "Mount root" mkdir -p rootfs -mount -o loop,offset=3D$(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + = ( ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${IMAGE_NAME} rootfs +mount -o loop,offset=3D$(( ( 512 * 2048 ) + ( ${BOOT_MEGABYTES} * 1024 = * 1024 ) + ( ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${IMAGE_NAME} rootfs echo "Mount boot" mkdir -p rootfs/boot -mount -o loop,offset=3D512 ${IMAGE_NAME} rootfs/boot +mount -o loop,offset=3D$(( 512 * 2048 )) ${IMAGE_NAME} rootfs/boot cd rootfs =20 # Setup Gentoo