diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh index 7e84752..9e8b25a 100644 --- a/lib/util-iso-boot.sh +++ b/lib/util-iso-boot.sh @@ -65,6 +65,11 @@ copy_initcpio(){ cp mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf } +add_kernel_modules(){ + local conf='MODULES="'${kernel_modules}'"' + sed -e "s|^.*MODULES=.*|${conf}|" -i $1/etc/mkinitcpio-${iso_name}.conf +} + write_loader_conf(){ local fn=loader.conf local conf=$1/${fn} diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 257b6ff..7aac83f 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -350,6 +350,10 @@ make_image_boot() { aufs_mount_root_image "${path}" fi copy_initcpio "${path}" + + # possible approach to PXE boot + #add_kernel_modules "${path}" + gen_boot_image "${path}" mv ${path}/boot/${iso_name}.img ${path_iso}/${arch}/${iso_name}.img if [[ -f ${path}/boot/intel-ucode.img ]]; then @@ -480,6 +484,16 @@ check_chroot_iso_version(){ fi } +check_plymouth(){ + is_plymouth=false + source mkinitcpio.conf + for h in ${HOOKS[@]};do + if [[ $h == 'plymouth' ]];then + is_plymouth=true + fi + done +} + # $1: profile load_profile(){ msg3 "Profile: [$1]" @@ -501,13 +515,9 @@ load_profile(){ fi create_args+=(-C ${pacman_conf}) work_dir=${chroots_iso}/$1/${arch} - is_plymouth=false - source mkinitcpio.conf - for h in ${HOOKS[@]};do - if [[ $h == 'plymouth' ]];then - is_plymouth=true - fi - done + + check_plymouth + [[ -d ${work_dir}/root-image ]] && check_chroot_iso_version } diff --git a/lib/util.sh b/lib/util.sh index e7f273d..fa595c4 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -363,6 +363,10 @@ load_profile_config(){ displaymanager="none" fi +# if [[ -z ${kernel_modules} ]];then +# kernel_modules="" +# fi + return 0 }