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

util-iso-boot: rm efi syslinux code

Browse source
This commit is contained in:
udeved 2016-10-06 21:43:10 +02:00
parent e393e7c851
commit 3d3e67fa27
2 changed files with 0 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,66 +227,3 @@ write_isomounts(){
msg2 "Writing root entry ..."
echo "${target_arch}/root-image.sqfs ${target_arch} / squashfs" >> ${file}
}
################################# testing syslinux efi ####################################
copy_syslinux_efi(){
msg2 "Copying syslinux efi binaries ..."
cp $1/usr/lib/syslinux/efi64/{ldlinux.e64,*.c32} $2
cp $1/usr/lib/syslinux/efi64/syslinux.efi $2/bootx64.efi
cp ${DATADIR}/isolinux/back800x600.jpg $2/splash.jpg
}
write_syslinux_cfg(){
local conf=$1/syslinux.cfg
msg2 "Writing %s ..." "syslinux.cfg"
echo "DEFAULT free" > $conf
echo "PROMPT 1" >> $conf
echo "TIMEOUT 200" >> $conf
echo "#KBDMAP de.ktl" >> $conf
echo "" >> $conf
echo "UI vesamenu.c32" >> $conf
echo "" >> $conf
echo "MENU TITLE ${dist_name} Linux" >> $conf
echo "MENU BACKGROUND splash.jpg" >> $conf
echo "" >> $conf
echo "MENU COLOR border 30;44 #40ffffff #a0000000 std" >> $conf
echo "MENU COLOR title 1;36;44 #9033ccff #a0000000 std" >> $conf
echo "MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all" >> $conf
echo "MENU COLOR unsel 37;44 #50ffffff #a0000000 std" >> $conf
echo "MENU COLOR help 37;40 #c0ffffff #a0000000 std" >> $conf
echo "MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std" >> $conf
echo "MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std" >> $conf
echo "MENU COLOR msg07 37;40 #90ffffff #a0000000 std" >> $conf
echo "MENU COLOR tabmsg 31;40 #30ffffff #00000000 std" >> $conf
echo "" >> $conf
echo "LABEL free" >> $conf
echo " MENU LABEL ${dist_name} Linux ${target_arch}" >> $conf
case $2 in
usb)
echo " LINUX /EFI/miso/${iso_name}.efi" >> $conf
echo " INITRD /EFI/miso/${iso_name}.img" >> $conf
;;
dvd)
echo " LINUX /${iso_name}/boot/${target_arch}/${iso_name}" >> $conf
echo " INITRD /${iso_name}/boot/${target_arch}/${iso_name}.img" >> $conf
;;
esac
if ${nonfree_mhwd};then
echo " APPEND misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo nonfree=yes overlay=nonfree $(gen_boot_args)" >> $conf
else
echo " APPEND misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo nonfree=no overlay=nonfree $(gen_boot_args)" >> $conf
fi
echo "" >> $conf
echo "LABEL hdt" >> $conf
echo " MENU LABEL HDT (Hardware Detection Tool)" >> $conf
echo " COM32 hdt.c32" >> $conf
echo "" >> $conf
echo "LABEL reboot" >> $conf
echo " MENU LABEL Reboot" >> $conf
echo " COM32 reboot.c32" >> $conf
echo "" >> $conf
echo "LABEL poweroff" >> $conf
echo " MENU LABEL Poweroff" >> $conf
echo " COM32 poweroff.c32" >> $conf
}

8
lib/util-iso.sh
View file

@ -335,10 +335,6 @@ make_efi_usb() {
write_efi_loader_conf "${work_dir}/iso/loader"
write_usb_efi_loader_entry "${work_dir}" "no"
${nonfree_mhwd} && write_usb_efi_loader_entry "${work_dir}" "yes"
# copy_syslinux_efi "${work_dir}/live-image" "${boot}"
# write_syslinux_cfg "${boot}" "usb"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [%s/boot/EFI]" "${iso_name}"
fi
@ -362,10 +358,6 @@ make_efi_dvd() {
write_efi_loader_conf "${work_dir}/efiboot/loader"
write_dvd_efi_loader_entry "${work_dir}" "no"
${nonfree_mhwd} && write_dvd_efi_loader_entry "${work_dir}" "yes"
# copy_syslinux_efi "${work_dir}/live-image" "${boot}"
# write_syslinux_cfg "${boot}" "dvd"
umount ${work_dir}/efiboot
: > ${work_dir}/build.${FUNCNAME}
msg "Done [%s/iso/EFI]" "${iso_name}"