root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

util-iso-boot: copy syslinux from host

Browse source
This commit is contained in:
udeved 2016-10-07 16:19:53 +02:00
parent a0239812f3
commit f9a39680b1
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/util-iso-boot.sh
View file

@ -125,27 +125,27 @@ prepare_loader_entry(){
prepare_syslinux(){ prepare_syslinux(){
local syslinux=${run_dir}/shared/syslinux local syslinux=${run_dir}/shared/syslinux
msg2 "Copying syslinux splash ..." msg2 "Copying syslinux splash ..."
cp ${syslinux}/splash.png $2 cp ${syslinux}/splash.png $1
for conf in ${syslinux}/*.cfg ${syslinux}/${target_arch}/*.cfg; do for conf in ${syslinux}/*.cfg ${syslinux}/${target_arch}/*.cfg; do
msg2 "Copying %s ..." "${conf##*/}" msg2 "Copying %s ..." "${conf##*/}"
sed "s|@ISO_LABEL@|${iso_label}|g; sed "s|@ISO_LABEL@|${iso_label}|g;
s|@ISO_NAME@|${iso_name}|g; s|@ISO_NAME@|${iso_name}|g;
s|@BOOT_ARGS@|$(gen_boot_args)|g; s|@BOOT_ARGS@|$(gen_boot_args)|g;
s|@DIST_NAME@|${dist_name}|g" ${conf} > $2/${conf##*/} s|@DIST_NAME@|${dist_name}|g" ${conf} > $1/${conf##*/}
done done
msg2 "Copying syslinux binaries ..." msg2 "Copying syslinux binaries ..."
cp $1/usr/lib/syslinux/bios/*.c32 $2 cp /usr/lib/syslinux/bios/*.c32 $1
cp $1/usr/lib/syslinux/bios/lpxelinux.0 $2 cp /usr/lib/syslinux/bios/lpxelinux.0 $1
cp $1/usr/lib/syslinux/bios/memdisk $2 cp /usr/lib/syslinux/bios/memdisk $1
} }
prepare_isolinux(){ prepare_isolinux(){
msg2 "Copying isolinux.cfg ..." msg2 "Copying isolinux.cfg ..."
sed "s|@ISO_NAME@|${iso_name}|g" ${run_dir}/shared/isolinux/isolinux.cfg > $2/isolinux.cfg sed "s|@ISO_NAME@|${iso_name}|g" ${run_dir}/shared/isolinux/isolinux.cfg > $1/isolinux.cfg
msg2 "Copying isolinux binaries ..." msg2 "Copying isolinux binaries ..."
cp $1/usr/lib/syslinux/bios/isolinux.bin $2 cp /usr/lib/syslinux/bios/isolinux.bin $1
cp $1/usr/lib/syslinux/bios/isohdpfx.bin $2 cp /usr/lib/syslinux/bios/isohdpfx.bin $1
cp $1/usr/lib/syslinux/bios/ldlinux.c32 $2 cp /usr/lib/syslinux/bios/ldlinux.c32 $1
} }
write_isomounts(){ write_isomounts(){

4
lib/util-iso.sh
View file

@ -371,7 +371,7 @@ make_syslinux() {
msg "Prepare [%s/iso/syslinux]" "${iso_name}" msg "Prepare [%s/iso/syslinux]" "${iso_name}"
local path=${work_dir}/iso/${iso_name}/boot/syslinux local path=${work_dir}/iso/${iso_name}/boot/syslinux
mkdir -p ${path} mkdir -p ${path}
prepare_syslinux "${work_dir}/live-image" "${path}" prepare_syslinux "${path}"
mkdir -p ${path}/hdt mkdir -p ${path}/hdt
gzip -c -9 ${work_dir}/root-image/usr/share/hwdata/pci.ids > ${path}/hdt/pciids.gz gzip -c -9 ${work_dir}/root-image/usr/share/hwdata/pci.ids > ${path}/hdt/pciids.gz
gzip -c -9 ${work_dir}/live-image/usr/lib/modules/*-MANJARO/modules.alias > ${path}/hdt/modalias.gz gzip -c -9 ${work_dir}/live-image/usr/lib/modules/*-MANJARO/modules.alias > ${path}/hdt/modalias.gz
@ -385,7 +385,7 @@ make_isolinux() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare [%s/iso/isolinux]" "${iso_name}" msg "Prepare [%s/iso/isolinux]" "${iso_name}"
mkdir -p ${work_dir}/iso/isolinux mkdir -p ${work_dir}/iso/isolinux
prepare_isolinux "${work_dir}/live-image" "${work_dir}/iso/isolinux" prepare_isolinux "${work_dir}/iso/isolinux"
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}
msg "Done [%s/iso/isolinux]" "${iso_name}" msg "Done [%s/iso/isolinux]" "${iso_name}"
fi fi