diff options
| author | Eli Schwartz via arch-releng <arch-releng@archlinux.org> | 2018-07-31 19:27:11 -0400 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@gmail.com> | 2018-08-01 00:56:20 -0300 |
| commit | ddad85c86aef056c5475139e13f771856b47d1f4 (patch) | |
| tree | 0cea8e3fb531748e62351da740a60f5b85919b88 | |
| parent | d4a9ba4b785a2ebb0218057e7b25d7dbcc1d4b68 (diff) | |
| download | archiso32-ddad85c86aef056c5475139e13f771856b47d1f4.tar.xz | |
make detection of kernel modules dir more robust
extract `uname -r` from the contents of vmlinuz-linux rather than make
assumptions about the kernel EXTRAVERSION.
This is trivially customizable by changing the chosen kernel image.
Fixes FS#59496
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
| -rwxr-xr-x | configs/releng/build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 180fa94..f5524e8 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -124,6 +124,7 @@ make_boot_extra() { # Prepare /${install_dir}/boot/syslinux make_syslinux() { + _uname_r=$(file -b ${work_dir}/x86_64/airootfs/boot/vmlinuz-linux| awk 'f{print;f=0} /version/{f=1}' RS=' ') mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux for _cfg in ${script_path}/syslinux/*.cfg; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; @@ -135,7 +136,7 @@ make_syslinux() { cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt gzip -c -9 ${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz - gzip -c -9 ${work_dir}/x86_64/airootfs/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz + gzip -c -9 ${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz } # Prepare /isolinux |