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

[util-iso-boot] echo out when using intel_ucode.img

Browse source
This commit is contained in:
Philip 2015-04-15 10:10:29 +02:00 committed by Ramon Buldó
parent 90684e6a57
commit 3021382c93
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ copy_boot_images(){
cp $1/x86_64/${iso_name} $2/${iso_name}.efi
cp $1/x86_64/${iso_name}.img $2/${iso_name}.img
if [[ -f $1/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
cp $1/intel_ucode.img $2/intel_ucode.img
fi
}
@ -95,6 +96,7 @@ write_dvd_conf(){
echo "title ${dist_name} Linux ${arch} UEFI DVD (default)" > ${conf}
echo "linux /EFI/miso/${iso_name}.efi" >> ${conf}
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
echo "initrd /EFI/miso/intel_ucode.img" >> ${conf}
fi
echo "initrd /EFI/miso/${iso_name}.img" >> ${conf}
@ -108,6 +110,7 @@ write_dvd_nonfree_conf(){
echo "title ${dist_name} Linux ${arch} UEFI DVD (nonfree)" > ${conf}
echo "linux /EFI/miso/${iso_name}.efi" >> ${conf}
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
echo "initrd /EFI/miso/intel_ucode.img" >> ${conf}
fi
echo "initrd /EFI/miso/${iso_name}.img" >> ${conf}
@ -121,6 +124,7 @@ write_usb_conf(){
echo "title ${dist_name} Linux ${arch} UEFI USB (default)" > ${conf}
echo "linux /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
echo "initrd /${iso_name}/boot/intel_ucode.img" >> ${conf}
fi
echo "initrd /${iso_name}/boot/${arch}/${iso_name}.img" >> ${conf}
@ -134,6 +138,7 @@ write_usb_nonfree_conf(){
echo "title ${dist_name} Linux ${arch} UEFI USB (nonfree)" > ${conf}
echo "linux /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
echo "initrd /${iso_name}/boot/intel_ucode.img" >> ${conf}
fi
echo "initrd /${iso_name}/boot/${arch}/${iso_name}.img" >> ${conf}
@ -181,6 +186,7 @@ write_isolinux_cfg(){
echo "label start" >> ${conf}
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
else
echo " append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
@ -189,6 +195,7 @@ write_isolinux_cfg(){
echo "label nonfree" >> ${conf}
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
msg2 "Using intel_ucode.img ..."
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
else
echo " append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}