From a9fbcac5a8e4bff84d34659fb3450c749ee1cd6c Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Thu, 8 Oct 2020 19:15:24 +0800
Subject: distro/arch: use img_dev and img_loop cmdline

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

diff --git a/distro/arch/entry1 b/distro/arch/entry1
index e488bbe..38dfcd3 100644
--- a/distro/arch/entry1
+++ b/distro/arch/entry1
@@ -3,5 +3,5 @@ KERNEL=/liveusb-kernel/$KEYWORD/x86_64/vmlinuz-linux
 INITRD=(/liveusb-kernel/$KEYWORD/intel-ucode.img
 	/liveusb-kernel/$KEYWORD/amd-ucode.img
 	/liveusb-kernel/$KEYWORD/x86_64/initramfs-linux.img)
-OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/$KEYWORD"
+OPTION="img_dev=/dev/disk/by-uuid/$UUID img_loop=liveusb-data/$KEYWORD/$ISOFILE"
 X64=y
diff --git a/distro/arch/install.sh b/distro/arch/install.sh
index 4e9f7db..1321a0b 100644
--- a/distro/arch/install.sh
+++ b/distro/arch/install.sh
@@ -1,8 +1,8 @@
 install_live() {
 	mount_iso
 	install -d "$DATADIR/$KEYWORD" "$KERNELDIR/$KEYWORD"
-	cp -r "$ISOMNT/arch/x86_64" "$DATADIR/$KEYWORD/"
 	cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/$KEYWORD/"
+	cp "${ISO_FILEPATH}" "$DATADIR/$KEYWORD/"
 	cp "$ISOMNT/arch/boot/"*.img "$KERNELDIR/$KEYWORD/"
 	umount_iso
 }
-- 
cgit v1.2.3