Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/baseline
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2020-07-28 11:38:04 +0200
committerDavid Runge <dvzrv@archlinux.org>2020-07-28 12:13:45 +0200
commit47e11125e4672fc3448caefa6728439160daedd3 (patch)
tree2b25a8ef2423b86ea51caa47bcb2783deaa94876 /configs/baseline
parentba6b44f80a4a48c0b66068a32a8596b4d4fc28d8 (diff)
Copy files more generically
configs/*: Copy all files that do not need a rename generically (not specifying a destination file name). Do not rename vmlinuz-linux to vmlinuz or vmlinuz.efi (as this serves no purpose and makes the scripts more complicated). Do not rename microcode (i.e. {amd,intel}-ucode.img) when copying them and change all boot loader configuration files that assume a renamed microcode image. Add note and link to Arch Linux wiki to state why memtest.bin is renamed to memtest. Copy license files for {amd,intel}-ucode and memtest more generically by placing them into subdirectories with the same name as the package (to circumenvent overwriting one other). Closes #33
Diffstat (limited to 'configs/baseline')
-rwxr-xr-xconfigs/baseline/build.sh2
-rw-r--r--configs/baseline/syslinux/syslinux.cfg2
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 6001cd8..0649d4b 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -77,7 +77,7 @@ make_setup_mkinitcpio() {
make_boot() {
mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
cp "${work_dir}/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img"
- cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz"
+ cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/"
}
# Prepare /${install_dir}/boot/syslinux
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 4f7ce4d..e31bb8c 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -7,6 +7,6 @@ TIMEOUT 30
LABEL arch
MENU LABEL Arch Linux
-LINUX boot/%ARCH%/vmlinuz
+LINUX boot/%ARCH%/vmlinuz-linux
INITRD boot/%ARCH%/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%