--- trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom 2014/07/09 07:22:35 2664 +++ trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom 2015/07/10 11:31:20 2872 @@ -151,7 +151,7 @@ fi mksquashfs ${LIVECDROOT}/network-temp ${CDISOROOT}/netboot/squashfs.img || die - # copy kernel and create initramfs to isoroot/netboot + # copy kernel, bootloader and create initramfs to isoroot/netboot install -d ${CDISOROOT}/netboot || die # kernel kimg="$(find ${CDCHROOTDIR}/boot -name kernel-\* -printf '%f\n')" @@ -161,15 +161,25 @@ echo 'add_dracutmodules+=" livenet busybox"' > ${CDCHROOTDIR}/etc/dracut.conf.d/03-netboot.conf || die echo 'omit_dracutmodules+=" systemd plymouth mcored"' >> ${CDCHROOTDIR}/etc/dracut.conf.d/03-netboot.conf || die # install dracut-dev package to have all modules - custom_packages install dracut-dev curl curl-dev || die + custom_packages install "dracut-dev curl curl-dev" || die ## mlivecdbuild function generate_initrd mv ${CDISOROOT}/isolinux/initrd.gz ${CDISOROOT}/netboot/ || die - custom_packages uninstall dracut-dev curl curl-dev || die + custom_packages uninstall "dracut-dev curl curl-dev" || die if [ -e ${CDCHROOTDIR}/etc/dracut.conf.d/03-netboot.conf ] then rm ${CDCHROOTDIR}/etc/dracut.conf.d/03-netboot.conf fi + # bootloader + install -d ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile netboot/pxelinux.0) ] && install -m0644 $(get_profile netboot/pxelinux.0) ${CDISOROOT}/netboot + [ -f $(get_profile netboot/pxelinux.cfg/default) ] && install -m0644 $(get_profile netboot/pxelinux.cfg/default) ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile netboot/pxelinux.cfg/boot.cat) ] && install -m0644 $(get_profile netboot/pxelinux.cfg/boot.cat) ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile boot.lss) ] && install -m0644 $(get_profile boot.lss) ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile boot.msg) ] && install -m0644 $(get_profile boot.msg) ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile debug.msg) ] && install -m0644 $(get_profile debug.msg) ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile help.msg) ] && install -m0644 $(get_profile help.msg) ${CDISOROOT}/netboot/pxelinux.cfg + [ -f $(get_profile index.msg) ] && install -m0644 $(get_profile index.msg) ${CDISOROOT}/netboot/pxelinux.cfg # final cleanup if [[ -d ${LIVECDROOT}/network-temp ]]