shinys000114/odroid-stamper
1
0
Fork 0
mirror of git://soft.sys114.com/odroid-stamper synced 2025-12-19 01:48:42 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve partition size calculation when creating an image

Browse Source 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ib2528702f888c954f47a4f1e83bd6ca4e81a713a
This commit is contained in:
Dongjin Kim
2021-03-17 12:10:40 +09:00
parent 0c9fbc3992
commit 09c7fcf46e
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
functions
View File

@@ -175,7 +175,6 @@ get_uuid_by_path() {
do_create_squashfs() {
local live_image=filesystem.squashfs
local disk=${1}
local boot_blk=$((${2} * 1024 * 1024 / 512 - 1))
local boot_pstart=$(get_reserved_sectors)
[ "x${boot_pstart}" = "x" ] && boot_pstart=2048
@@ -185,8 +184,8 @@ do_create_squashfs() {
mkdir -p ${boot_mnt}/casper
cp ${live_image} ${boot_mnt}/casper/ && rm -f ${live_image}
local blocks=$((${boot_pstart} + ${boot_blk} + 81920 * 4))
local boot_pend=$((${boot_pstart} + ${boot_blk}))
local boot_blk=$(($(du -s --block-size=512 ${boot_mnt} | cut -f1) * 12 / 10 - 1))
local blocks=$((${boot_pstart} + ${boot_blk}))
echo "I: creating the disk image file '${disk}' ($((${blocks} * 512))KiB)"
dd if=/dev/zero bs=512 count=${blocks} \
@@ -197,7 +196,7 @@ do_create_squashfs() {
echo "I: creating a partition table to '${disk}'"
echo ${BACKSLASH_ESCAPE} \
"n\np\n\n${boot_pstart}\n${boot_pend}\n" \
"n\np\n\n${boot_pstart}\n\n" \
"w\n" | fdisk ${disk} >/dev/null
partprobe
@@ -217,13 +216,13 @@ do_create_squashfs() {
do_create_partition() {
local disk=${1}
local boot_blk=$((${2} * 1024 * 1024 / 512 - 1))
local root_blk=$(du --block-size=512 ${rootfs_mnt} | tail -1 | awk '{print $1}')
local root_blk=$(($(du -s --block-size=512 ${rootfs_mnt} | cut -f1) * 12 / 10))
local boot_pstart=$(get_reserved_sectors)
[ "x${boot_pstart}" = "x" ] && boot_pstart=2048
local blocks=$((${boot_pstart} + ${boot_blk} + ${root_blk} + 81920 * 4))
local boot_pend=$((${boot_pstart} + ${boot_blk}))
local boot_size=$((${boot_pstart} + ${boot_blk}))
local blocks=$((${boot_pstart} + ${boot_blk} + ${root_blk}))
if [ -f ${TOPDIR}/custom/${CUSTOMOS}/partitions ]; then
. ${TOPDIR}/custom/${CUSTOMOS}/partitions
@@ -254,8 +253,8 @@ do_create_partition() {
fi
echo ${BACKSLASH_ESCAPE} \
"n\np\n\n${boot_pstart}\n${boot_pend}\n" \
"n\np\n\n$((${boot_pend} + 1))\n\n" \
"n\np\n\n${boot_pstart}\n${boot_size}\n" \
"n\np\n\n$((${boot_size} + 1))\n\n" \
"w\n" | fdisk ${disk} >/dev/null
partprobe
@@ -422,7 +421,7 @@ do_create_image() {
do_cleanup
do_unmount
if [ "x${LIVEBOOT}" = "xtrue" ]; then
do_create_squashfs ${baseimage} 512
do_create_squashfs ${baseimage}
else
do_create_partition ${baseimage} 256
fi