Make the Makefile $ARCH adjust the isomounts file

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 099bba9..7f98605 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -40,6 +40,7 @@ base-iso: root-image
 	mv $(WORKDIR)/root-image/boot $(WORKDIR)/iso/
 	cp -r boot-files/* $(WORKDIR)/iso/boot/
 	cp isomounts $(WORKDIR)
+	sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)/isomounts"
 	
 	mkinitcpio -c initcpio-ide -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_ide.img
 	mkinitcpio -c initcpio-pata -b $(WORKDIR)/root-image -k $(kver) -g $(WORKDIR)/iso/boot/archiso_pata.img
diff --git a/configs/install-iso/isomounts b/configs/install-iso/isomounts
index e88f8a9..71421b6 100644
--- a/configs/install-iso/isomounts
+++ b/configs/install-iso/isomounts
@@ -7,6 +7,6 @@
 # syntax: <img> <arch> <mount point> <type>
 
 # ORDER MATTERS! Files take top-down precedence. Be careful
-overlay.sqfs i686 / squashfs
-core-pkgs.sqfs i686 /src/core/pkg squashfs
-root-image.sqfs i686 / squashfs
+overlay.sqfs @ARCH@ / squashfs
+core-pkgs.sqfs @ARCH@ /src/core/pkg squashfs
+root-image.sqfs @ARCH@ / squashfs