summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-08-01 13:23:38 +0200
committerErich Eckner <git@eckner.net>2018-08-01 13:23:38 +0200
commit2a9f72c9083111125861dfec35b14e4c737e4f5f (patch)
treea95eae58df7771cc17e546a79067fdfa1327bd61 /configs
parentc5807ba819035f9c4f720cadbf5b149fa7d498c6 (diff)
parentddad85c86aef056c5475139e13f771856b47d1f4 (diff)
downloadarchiso32-2a9f72c9083111125861dfec35b14e4c737e4f5f.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/releng/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index aeb323a..678d654 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -138,6 +138,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;
@@ -148,8 +149,7 @@ make_syslinux() {
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/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