From eb4c7092ab0cb2afa56e574caada7f8f39b2206b Mon Sep 17 00:00:00 2001 From: amazingfate Date: Wed, 19 Oct 2022 10:32:40 +0800 Subject: [PATCH] Revert "use smaller node number for ext4 boot partition" This reverts commit aa692d7a77a05e5ef1a7b3da9c426941d803aabd. --- lib/functions/image/partitioning.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/functions/image/partitioning.sh b/lib/functions/image/partitioning.sh index 0aa3e24151..f99dae3c8f 100644 --- a/lib/functions/image/partitioning.sh +++ b/lib/functions/image/partitioning.sh @@ -32,7 +32,6 @@ prepare_partitions() { if [[ $BUILD_DESKTOP == yes ]]; then local node_number=4096; else local node_number=1024; fi if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|sid ]]; then mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum -N $((128 * ${node_number}))" - mkopts[ext4_boot]="-q -m 2 -O ^64bit,^metadata_csum -N $((128 * 1024))" fi # mkopts[fat] is empty mkopts[ext2]='-q' @@ -266,11 +265,7 @@ PREPARE_IMAGE_SIZE if [[ -n $bootpart ]]; then display_alert "Creating /boot" "$bootfs on ${LOOP}p${bootpart}" check_loop_device "${LOOP}p${bootpart}" - if [[ $bootfs == ext4 ]]; then - mkfs.${mkfs[$bootfs]} ${mkopts[${bootfs}_boot]} ${mkopts_label[$bootfs]:+${mkopts_label[$bootfs]}"$BOOT_FS_LABEL"} ${LOOP}p${bootpart} >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 - else - mkfs.${mkfs[$bootfs]} ${mkopts[$bootfs]} ${mkopts_label[$bootfs]:+${mkopts_label[$bootfs]}"$BOOT_FS_LABEL"} ${LOOP}p${bootpart} >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 - fi + mkfs.${mkfs[$bootfs]} ${mkopts[$bootfs]} ${mkopts_label[$bootfs]:+${mkopts_label[$bootfs]}"$BOOT_FS_LABEL"} ${LOOP}p${bootpart} >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 mkdir -p $MOUNT/boot/ mount ${LOOP}p${bootpart} $MOUNT/boot/ echo "UUID=$(blkid -s UUID -o value ${LOOP}p${bootpart}) /boot ${mkfs[$bootfs]} defaults${mountopts[$bootfs]} 0 2" >> $SDCARD/etc/fstab