Fiexs, and branch rename

export-image/01-user-rename/00-packages

@@ -1 +0,0 @@
-#userconf-pi

export-image/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

export-image/03-set-partuuid/00-run.sh

@@ -5,8 +5,8 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
 IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
 
 BOOT_PARTUUID="${IMGID}-01"
-ROOT_PARTUUID="${IMGID}-02"
-RECOVERY_PARTUUID="${IMGID}-03"
+RECOVERY_PARTUUID="${IMGID}-02"
+ROOT_PARTUUID="${IMGID}-03"
 
 sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
 sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"

export-image/prerun.sh

@@ -49,8 +49,8 @@ done
 
 ensure_loopdev_partitions "$LOOP_DEV"
 BOOT_DEV="${LOOP_DEV}p1"
-ROOT_DEV="${LOOP_DEV}p2"
-RECOVERY_DEV="${LOOP_DEV}p3"
+RECOVERY_DEV="${LOOP_DEV}p2"
+ROOT_DEV="${LOOP_DEV}p3"
 
 ROOT_FEATURES="^huge_file"
 for FEATURE in 64bit; do