From 918aadbdd97e6bba10d0ac3d2bd54e7e0858d7f0 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Sun, 2 Dec 2018 23:52:55 +0800
Subject: distro/arch: load amd_ucode, use $KEYWORD

---
 distro/arch/entry1     | 9 +++++----
 distro/arch/install.sh | 9 ++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/distro/arch/entry1 b/distro/arch/entry1
index ec1c626..7dfb24e 100644
--- a/distro/arch/entry1
+++ b/distro/arch/entry1
@@ -1,6 +1,7 @@
 TITLE='Arch Linux x86_64'
-KERNEL=/liveusb-kernel/arch/x86_64/vmlinuz
-INITRD=(/liveusb-kernel/arch/intel_ucode.img
-		/liveusb-kernel/arch/x86_64/archiso.img)
-OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/arch"
+KERNEL=/liveusb-kernel/$KEYWORD/x86_64/vmlinuz
+INITRD=(/liveusb-kernel/$KEYWORD/intel_ucode.img
+		/liveusb-kernel/$KEYWORD/amd_ucode.img
+		/liveusb-kernel/$KEYWORD/x86_64/archiso.img)
+OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/$KEYWORD"
 X64=y
diff --git a/distro/arch/install.sh b/distro/arch/install.sh
index cd27519..4e9f7db 100644
--- a/distro/arch/install.sh
+++ b/distro/arch/install.sh
@@ -1,10 +1,9 @@
 install_live() {
 	mount_iso
-	install -d "$DATADIR/arch"
-	cp -r "$ISOMNT/arch/x86_64" "$DATADIR/arch/"
-	install -d "$KERNELDIR/arch"
-	cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/arch/"
-	cp "$ISOMNT/arch/boot/intel_ucode.img" "$KERNELDIR/arch/"
+	install -d "$DATADIR/$KEYWORD" "$KERNELDIR/$KEYWORD"
+	cp -r "$ISOMNT/arch/x86_64" "$DATADIR/$KEYWORD/"
+	cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/$KEYWORD/"
+	cp "$ISOMNT/arch/boot/"*.img "$KERNELDIR/$KEYWORD/"
 	umount_iso
 }
 
-- 
cgit v1.2.3