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

[util-iso-boot] remove double space

Browse source
This commit is contained in:
Philip 2015-06-28 11:05:49 +02:00
parent 9497693a6f
commit 19df5a0a28
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,15 +203,15 @@ write_isolinux_cfg(){
echo '' >> ${conf}
echo "label start" >> ${conf}
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
plymouth_settings="quiet splash"
plymouth_settings=" quiet splash"
if ! ${plymouth_boot};then
plymouth_settings=""
fi
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 ${plymouth_settings} showopts" >> ${conf}
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${plymouth_settings} 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 ${plymouth_settings} showopts" >> ${conf}
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${plymouth_settings} showopts" >> ${conf}
fi
echo '' >> ${conf}
if ${nonfree_xorg};then
@ -219,9 +219,9 @@ write_isolinux_cfg(){
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 ${plymouth_settings} showopts" >> ${conf}
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${plymouth_settings} 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 ${plymouth_settings} showopts" >> ${conf}
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${plymouth_settings} showopts" >> ${conf}
fi
echo '' >> ${conf}
fi