diff options
| author | Erich Eckner <git@eckner.net> | 2018-08-01 13:19:55 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-08-01 13:19:55 +0200 |
| commit | 3010b97a2851352a9e6882906247ec46b5be2564 (patch) | |
| tree | c04b79fe8bd4df09451bb10f2633aef92f02ca93 | |
| parent | 8a2be06b903553cacb6d0842e108fbb7579ec148 (diff) | |
| parent | ddad85c86aef056c5475139e13f771856b47d1f4 (diff) | |
| download | archiso32-3010b97a2851352a9e6882906247ec46b5be2564.tar.xz | |
Merge remote-tracking branch 'upstream/master'
| -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 f9b2531..18743ef 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -129,6 +129,7 @@ make_boot_extra() { # Prepare /${install_dir}/boot/syslinux make_syslinux() { + _uname_r=$(file -b ${work_dir}/${arch}/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; @@ -140,7 +141,7 @@ make_syslinux() { cp ${work_dir}/${arch}/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}/${arch}/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz - gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz + gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz } # Prepare /isolinux |