From b6287916c2b96d8d45ddc86a961a47d0e46740eb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lallement <jean-baptiste.lallement@ubuntu.com>
Date: Thu, 8 Nov 2018 11:06:41 +0100
Subject: [PATCH] auto/build: Order generated squashfs filesystems

---
 live-build/auto/build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index 00bb2602..7e939c2c 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -480,10 +480,11 @@ EOF
 	lb binary "$@"
 
 	# Create layered squashfs system
+	CURPASS=1
 	if [ "${IMAGEFORMAT:-}" = live-layered ]; then
 		for _PASS in $PASSES
 		do
-			squashfs_f="${PWD}/livecd.${PROJECT}.${_PASS}.squashfs"
+			squashfs_f="${PWD}/livecd.${PROJECT}.$(printf "%02g" $CURPASS)-${_PASS}.squashfs"
 
 			(cd "chroot.${_PASS}/" &&
       			mksquashfs . ${squashfs_f} \
@@ -491,6 +492,7 @@ EOF
 
 			squashfs_f_manifest="${squashfs_f}.manifest"
 			create_manifest "chroot.${_PASS}/" "${squashfs_f_manifest}"
+			CURPASS=$(( CURPASS + 1 ))
 		done
 	fi