diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-01-26 15:06:06 (GMT) |
|---|---|---|
| committer | Anish Mangal <anish@sugarlabs.org> | 2011-09-19 13:27:48 (GMT) |
| commit | d43ff8f50885ee87d048a6cd30a1242490980a25 (patch) | |
| tree | 0d5cd6c0472d4fa98709fea413aa89c13883caf8 | |
| parent | a1bf390436d253d2fe290aff03da954819af9f6a (diff) | |
sd_card_image: unversioned layout: don't duplicate files for /boot
Duplicating the files destined for the boot partition on the root partition
takes up precious space and has no real benefit: OFW can't use them because
the root file system is ext4 (that was the reason to have a separate boot
partition in the first place).
| -rw-r--r-- | modules/sd_card_image/image.50.makefs.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/modules/sd_card_image/image.50.makefs.sh b/modules/sd_card_image/image.50.makefs.sh index 6e61eb7..4fdc677 100644 --- a/modules/sd_card_image/image.50.makefs.sh +++ b/modules/sd_card_image/image.50.makefs.sh @@ -10,12 +10,11 @@ NUM_SECTORS_PER_TRACK=62 # FIXME trap signals and cleanup # FIXME check that traps due to errors are caught -BOOT=$intermediatesdir/mnt-boot ROOT=$intermediatesdir/mnt-root +BOOT=$ROOT/boot umount $BOOT &>/dev/null || : umount $ROOT &>/dev/null || : -mkdir -p $BOOT mkdir -p $ROOT @@ -60,12 +59,13 @@ EOF losetup -o $(((8192 + 131072) * $BLOCK_SIZE)) --sizelimit $(($img_sectors * $BLOCK_SIZE)) /dev/loop7 $img echo "Create filesystems..." - mke2fs -O dir_index,^resize_inode -L Boot -F /dev/loop6 - mount /dev/loop6 $BOOT - mkfs.ext4 -O dir_index,^huge_file -E resize=8G -m1 -L OLPCRoot /dev/loop7 tune2fs -o journal_data_ordered /dev/loop7 mount /dev/loop7 $ROOT + mkdir -p $BOOT + + mke2fs -O dir_index,^resize_inode -L Boot -F /dev/loop6 + mount /dev/loop6 $BOOT echo "Copy in root filesystem..." cp -a $fsmount/* $ROOT @@ -92,12 +92,11 @@ EOF ln -s boot/alt $BOOT/boot-alt cp -ar $ROOT/versions/pristine/$buildnr/boot/* $tgt else - cp -ar $ROOT/boot/* $BOOT ln -s . $BOOT/boot fi - umount $ROOT umount $BOOT + umount $ROOT losetup -d /dev/loop6 || : losetup -d /dev/loop7 || : |