make root filesystem 4M aligned (RPi-Distro#154)

jamesruan · XECDesign · commit 40eae05204c0 · 2018-03-01T17:52:26.000Z
diff --git a/export-image/prerun.sh b/export-image/prerun.sh
@@ -13,6 +13,7 @@ BOOT_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 | cut
 TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 | cut -f 1)
 
 ROUND_SIZE="$((4 * 1024 * 1024))"
+ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))
 IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE))
 
 truncate -s ${IMG_SIZE} ${IMG_FILE}
@@ -29,7 +30,7 @@ c
 n
 
 
-8192
+${ROUNDED_ROOT_SECTOR}
 
 
 p

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ BOOT_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 \| cut`
`13`	`13`	`TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 \| cut -f 1)`
`14`	`14`
`15`	`15`	`ROUND_SIZE="$((4 * 1024 * 1024))"`
	`16`	`+ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))`
`16`	`17`	`IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE))`
`17`	`18`
`18`	`19`	`truncate -s ${IMG_SIZE} ${IMG_FILE}`
`@@ -29,7 +30,7 @@ c`
`29`	`30`	`n`
`30`	`31`
`31`	`32`
`32`		`-8192`
	`33`	`+${ROUNDED_ROOT_SECTOR}`
`33`	`34`
`34`	`35`
`35`	`36`	`p`