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

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

commit:     c9ff63e4a36d2eb2e2ed783787d2e572cfcdaa68
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Sat Jun  4 17:43:54 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Sat Jun  4 17:43:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=c9ff63e4

Fixed mounting! We're now booting to a login prompt

---
 create_image.sh |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/create_image.sh b/create_image.sh
index 61ab9e7..69cc84e 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -3,9 +3,10 @@
 IMAGE_BASENAME="${1}"
 IMAGE_NAME="${IMAGE_BASENAME}.image"
 IMAGE_OUT="${IMAGE_BASENAME}.vdi"
+IMAGE_MEGABYTES="${2}"
 BOOT_MEGABYTES=64
 SWAP_MEGABYTES=128
-IMAGE_MEGABYTES="${2}"
+ROOT_MEGABYTES=$(( ${IMAGE_MEGABYTES} - ( ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} + 1 ) ))
 IMAGE_BYTES=$(( ${IMAGE_MEGABYTES} * 1024 * 1024 ))
 TIMEZONE="Europe/London"
 HOSTNAME="gentoo"
@@ -46,7 +47,7 @@ losetup ${LOOP_DEV_IMAGE} ${IMAGE_NAME} &>> ${LOG_FILE}
 sfdisk ${LOOP_DEV_IMAGE} -H64 -S32 &>> ${LOG_FILE} << EOF
 1,${BOOT_MEGABYTES},83,*
 $(( 1+ ${BOOT_MEGABYTES} )),${SWAP_MEGABYTES},82,-
-$(( 1+ ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} )),,83,-
+$(( 1+ ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} )),${ROOT_MEGABYTES},83,-
 EOF
 sleep 2
 losetup -d ${LOOP_DEV_IMAGE}
@@ -55,19 +56,19 @@ losetup -d ${LOOP_DEV_IMAGE}
 echo "Creating filesystems"
 
 LOOP_DEV_BOOT=`losetup -f`
-losetup -o $(( 512 * 2048 )) ${LOOP_DEV_BOOT} ${IMAGE_NAME}
+losetup -o $(( 512 * 2048 )) --sizelimit $(( ${BOOT_MEGABYTES} * 1024 * 1024 )) ${LOOP_DEV_BOOT} ${IMAGE_NAME}
 mkfs -t ext2 ${LOOP_DEV_BOOT} &>> ${LOG_FILE}
 sleep 2
 losetup -d ${LOOP_DEV_BOOT}
 
 LOOP_DEV_ROOT=`losetup -f`
-losetup -o $(( ( 512 * 2048 )  + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + ( ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${LOOP_DEV_ROOT} ${IMAGE_NAME}
+losetup -o $(( ( 512 * 2048 )  + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + ( ${SWAP_MEGABYTES} * 1024 * 1024 ) )) --sizelimit $(( ${ROOT_MEGABYTES} * 1024 * 1024 )) ${LOOP_DEV_ROOT} ${IMAGE_NAME}
 mkfs -t ext3 ${LOOP_DEV_ROOT} &>> ${LOG_FILE}
-#sleep 2
-#losetup -d ${LOOP_DEV_ROOT}
+sleep 2
+losetup -d ${LOOP_DEV_ROOT}
 
 LOOP_DEV_SWAP=`losetup -f`
-losetup -o $(( ( 512 * 2048 ) + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) )) ${LOOP_DEV_SWAP} ${IMAGE_NAME}
+losetup -o $(( ( 512 * 2048 ) + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) )) --sizelimit $(( ${SWAP_MEGABYTES} * 1024 * 1024 )) ${LOOP_DEV_SWAP} ${IMAGE_NAME}
 mkswap ${LOOP_DEV_SWAP} &>> ${LOG_FILE}
 sleep 2 
 losetup -d ${LOOP_DEV_SWAP}