root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

uti-iso-boot: revert 2d60754742

Browse source
This commit is contained in:
udeved 2017-03-09 01:16:51 +01:00
parent 2d60754742
commit 2a9266584a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,13 +108,13 @@ prepare_efi_loader(){
vars_to_boot_conf $2/loader/loader.conf
cp ${efi_data}/uefi-shell-v{1,2}-x86_64.conf ${entries}
local drv='nonfree' switch="no"
local label='free' switch="no"
cp ${efi_data}/entry-x86_64-$3.conf ${entries}/${iso_name}-x86_64.conf
vars_to_boot_conf "${entries}/${iso_name}-x86_64.conf" "$drv" "$switch"
vars_to_boot_conf "${entries}/${iso_name}-x86_64.conf" "$label" "$switch"
if ${nonfree_mhwd};then
switch="yes"
label='nonfree' switch="yes"
cp ${efi_data}/entry-x86_64-$3.conf ${entries}/${iso_name}-x86_64-nonfree.conf
vars_to_boot_conf "${entries}/${iso_name}-x86_64-nonfree.conf" "$drv" "$switch"
vars_to_boot_conf "${entries}/${iso_name}-x86_64-nonfree.conf" "$label" "$switch"
fi
}