From 80d35be19270209f8878d1b533f8d3463c840f98 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 30 Jan 2018 12:48:33 -0600
Subject: adelie-build-cd: run post-arch before adding kernel

---
 adelie-build-cd | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/adelie-build-cd b/adelie-build-cd
index 9b54839..d939db7 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -262,7 +262,6 @@ make_initrd() {
 	cp squashroot-$ARCH/usr/lib/liblzma.so.5 initrd-$ARCH/lib/
 	cp squashroot-$ARCH/lib/libudev.so.1 initrd-$ARCH/lib/
 	cp squashroot-$ARCH/lib/libz.so.1 initrd-$ARCH/lib/
-	cp squashroot-$ARCH/etc/udev/hwdb.bin initrd-$ARCH/etc/udev/
 
 	# init
 	cp cdinit-$ARCH initrd-$ARCH/init
@@ -277,14 +276,14 @@ make_initrd() {
 }
 
 prepare_cdroot() {
-	header 'Adding kernel...'
-
-	cp squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage
-
 	if test -f post-$ARCH.sh; then
 		header 'Running architecture-specific scripts...'
 		sh post-$ARCH.sh
 	fi
+
+	header 'Adding kernel...'
+
+	cp squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage
 }
 
 create_iso() {
@@ -306,7 +305,6 @@ case $PHASE in
 		make_initrd
 		;;
 	iso)
-		squash_it
 		prepare_cdroot
 		create_iso
 		;;
-- 
cgit v1.2.3-70-g09d2