From ae61fe98419a46847009f0153d6b2e43f5bed891 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 2 Feb 2020 15:38:13 -0600
Subject: Use arch suffixes for bzImage/initrd/squashfs; fix GRUB root set

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

(limited to 'adelie-build-cd')

diff --git a/adelie-build-cd b/adelie-build-cd
index 4a9fe3d..18d77a5 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -256,7 +256,7 @@ make_structure() {
 squash_it() {
 	header 'Creating compressed file system image...'
 
-	mksquashfs squashroot-$ARCH cdroot-$ARCH/adelie.squashfs -noappend
+	mksquashfs squashroot-$ARCH cdroot-$ARCH/$ARCH.squashfs -noappend
 }
 
 make_initrd() {
@@ -304,9 +304,9 @@ make_initrd() {
 
 	header 'Compressing initrd...'
 
-	(cd initrd-$ARCH; find . | cpio -H newc -o) > cdroot-$ARCH/initrd
-	gzip -9 cdroot-$ARCH/initrd
-	mv cdroot-$ARCH/initrd.gz cdroot-$ARCH/initrd
+	(cd initrd-$ARCH; find . | cpio -H newc -o) > cdroot-$ARCH/initrd-$ARCH
+	gzip -9 cdroot-$ARCH/initrd-$ARCH
+	mv cdroot-$ARCH/initrd-$ARCH.gz cdroot-$ARCH/initrd-$ARCH
 }
 
 prepare_cdroot() {
@@ -322,7 +322,7 @@ prepare_cdroot() {
 
 	header 'Adding kernel...'
 
-	mv squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage
+	mv squashroot-$ARCH/boot/vmlinu* cdroot-$ARCH/bzImage-$ARCH
 }
 
 create_iso() {
-- 
cgit v1.2.3-70-g09d2