From 3c98b419c34f5cc204ae1a6284fce6b269ff1b58 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Tue, 30 Mar 2021 13:15:01 +0800
Subject: arch: update meta file to use the new script

---
 distro/arch/meta | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'distro')

diff --git a/distro/arch/meta b/distro/arch/meta
index 5f375ed..fcfe18f 100644
--- a/distro/arch/meta
+++ b/distro/arch/meta
@@ -1,20 +1,20 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# TODO: detect kernel, initramfs, and ucode filenames
+
 entry() {
 	TITLE="$ISONAME"
-	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"
+	prefix="/liveusb-kernel/$KEYWORD/arch/boot"
+	KERNEL="$prefix/x86_64/vmlinuz-linux"
+	INITRD=("$prefix/intel-ucode.img" "$prefix/amd-ucode.img"
+		"$prefix/x86_64/initramfs-linux.img")
+	OPTION="img_dev=/dev/disk/by-uuid/$UUID img_loop=liveusb-data/$KEYWORD/$ISONAME"
 	X64=y
 }
 
 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 "$ISOMNT/arch/boot/"*.img "$KERNELDIR/$KEYWORD/"
-	umount_iso
+	iso_extract "${ISO_FILEPATH}" arch/boot/x86_64 'arch/boot/*.img' "$KERNELDIR/$KEYWORD/"
+	cp "${ISO_FILEPATH}" "$DATADIR/$KEYWORD/"
 }
 
 entries=(entry)
-- 
cgit v1.2.3