Merge branch 'master' into devel

This commit is contained in:
Philip 2014-12-29 18:40:17 +01:00
commit 5e8f1566ba

View file

@ -708,7 +708,6 @@ make_boot() {
gen_boot_img
mv ${work_dir}/boot-image/boot/${img_name}.img ${work_dir}/iso/${install_dir}/boot/${arch}/${img_name}.img
cp ${work_dir}/boot-image/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img
cp ${work_dir}/boot-image/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE