Fiexs, and branch rename

2025-04-28 12:43:11 -07:00
parent 19c43a6ca7
commit ab106ee155
19 changed files with 7 additions and 56 deletions
--- a/export-iso/01-set-sources/01-run.sh
+++ b/export-iso/01-set-sources/01-run.sh
--- a/export-iso/01-user-rename/00-packages
+++ b/export-iso/01-user-rename/00-packages
@@ -1 +0,0 @@
-#userconf-pi
--- a/export-iso/01-user-rename/01-run.sh
+++ b/export-iso/01-user-rename/01-run.sh
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-#if [[ "${DISABLE_FIRST_BOOT_USER_RENAME}" == "0" ]]; then
-#	on_chroot <<- EOF
-#		SUDO_USER="${FIRST_USER_NAME}" rename-user -f -s
-#	EOF
-#else
-#	rm -f "${ROOTFS_DIR}/etc/xdg/autostart/piwiz.desktop"
-#fi
--- a/export-iso/02-network/01-run.sh
+++ b/export-iso/02-network/01-run.sh
--- a/export-iso/02-network/files/resolv.conf
+++ b/export-iso/02-network/files/resolv.conf
--- a/export-iso/03-set-partuuid/00-run.sh
+++ b/export-iso/03-set-partuuid/00-run.sh
--- a/export-iso/04-finalise/01-run.sh
+++ b/export-iso/04-finalise/01-run.sh
--- a/export-iso/prerun.sh
+++ b/export-iso/prerun.sh
@@ -21,7 +21,7 @@ ROOT_PART_START=$((BOOT_PART_START + BOOT_PART_SIZE))
 ROOT_PART_SIZE=$(((ROOT_SIZE + ROOT_MARGIN + ALIGN - 1) / ALIGN * ALIGN))
 RECOVERY_PART_START=$((ROOT_PART_START + ROOT_PART_SIZE))
 RECOVERY_PART_SIZE=$(((RECOVERY_SIZE + ALIGN - 1) / ALIGN * ALIGN))
-IMG_SIZE=$((RECOVERY_PART_START + RECOVERY_PART_SIZE))
+IMG_SIZE=$((BOOT_PART_START + BOOT_PART_SIZE + ROOT_PART_SIZE + RECOVERY_PART_SIZE))

 # Create raw image
 truncate -s "${IMG_SIZE}" "${IMG_FILE}"