diff options
| author | Iru Cai <mytbk920423@gmail.com> | 2018-12-02 23:52:55 +0800 |
|---|---|---|
| committer | Iru Cai <mytbk920423@gmail.com> | 2018-12-03 00:00:38 +0800 |
| commit | 918aadbdd97e6bba10d0ac3d2bd54e7e0858d7f0 (patch) | |
| tree | 86f041666179e4c8ea3af2014fc79c427545f882 | |
| parent | 80d58a66f2fc84d40c0338193c105d400e5921d6 (diff) | |
| download | liveusb-builder-918aadbdd97e6bba10d0ac3d2bd54e7e0858d7f0.tar.xz | |
distro/arch: load amd_ucode, use $KEYWORD
| -rw-r--r-- | distro/arch/entry1 | 9 | ||||
| -rw-r--r-- | 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 } |