summaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2021-03-29 12:40:18 +0800
committerIru Cai <mytbk920423@gmail.com>2021-03-29 13:47:51 +0800
commitf48291dec27b4c95f8678c63a5e0ed55d5b29e4b (patch)
tree9b27026be9c7aa70831a481ec0e30ca726fb78bf /distro
parent73a73be078f8d20401063a85ed5544ca6db98015 (diff)
downloadliveusb-builder-f48291dec27b4c95f8678c63a5e0ed55d5b29e4b.tar.xz
distro/arch: use iso_extract
Diffstat (limited to 'distro')
-rw-r--r--distro/arch/entry18
-rw-r--r--distro/arch/install.sh5
2 files changed, 5 insertions, 8 deletions
diff --git a/distro/arch/entry1 b/distro/arch/entry1
index 38dfcd3..07656b6 100644
--- a/distro/arch/entry1
+++ b/distro/arch/entry1
@@ -1,7 +1,7 @@
TITLE='Arch Linux x86_64'
-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)
+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/$ISOFILE"
X64=y
diff --git a/distro/arch/install.sh b/distro/arch/install.sh
index 1321a0b..96e583e 100644
--- a/distro/arch/install.sh
+++ b/distro/arch/install.sh
@@ -1,9 +1,6 @@
install_live() {
- mount_iso
install -d "$DATADIR/$KEYWORD" "$KERNELDIR/$KEYWORD"
- cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/$KEYWORD/"
+ iso_extract "${ISO_FILEPATH}" arch/boot/x86_64 'arch/boot/*.img' "$KERNELDIR/$KEYWORD/"
cp "${ISO_FILEPATH}" "$DATADIR/$KEYWORD/"
- cp "$ISOMNT/arch/boot/"*.img "$KERNELDIR/$KEYWORD/"
- umount_iso
}