summaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2021-03-30 13:15:01 +0800
committerIru Cai <mytbk920423@gmail.com>2021-03-30 19:24:51 +0800
commit3c98b419c34f5cc204ae1a6284fce6b269ff1b58 (patch)
tree84753ac6752c70781a8b9a9410b3e076baaabdcf /distro
parent2c36b395ceac26b56872baba3fd86ac17acc43e3 (diff)
downloadliveusb-builder-3c98b419c34f5cc204ae1a6284fce6b269ff1b58.tar.xz
arch: update meta file to use the new script
Diffstat (limited to 'distro')
-rw-r--r--distro/arch/meta20
1 files changed, 10 insertions, 10 deletions
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)