[util-iso-boot] plymouth and pxe will be set on copy

lib/util-iso-boot.sh

@@ -32,6 +32,17 @@ copy_efi_shells(){
 	fi
 }
 
+set_mkinicpio_hooks(){
+	local conf=$1/etc/mkinitcpio-${iso_name}.conf
+	if ! ${pxe_boot};then
+		sed -e 's/miso_pxe_common miso_pxe_http//' -i ${conf}
+	elif ! ${plymouth};then
+		sed -e 's/plymouth//' -i ${conf}
+	elif ! ${plymouth} && ! ${pxe_boot};then
+		sed -e 's/plymouth//' -e 's/miso_pxe_common miso_pxe_http//' -i ${conf}
+	fi
+}
+
 # $1: work_dir
 gen_boot_image(){
 	local _kernver=$(cat $1/usr/lib/modules/*/version)
@@ -63,6 +74,7 @@ copy_initcpio(){
 	cp /usr/lib/initcpio/hooks/miso* $1/usr/lib/initcpio/hooks
 	cp /usr/lib/initcpio/install/miso* $1/usr/lib/initcpio/install
 	cp mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
+	set_mkinicpio_hooks "$1"
 }
 
 copy_ucode(){

lib/util-iso-image.sh

@@ -38,7 +38,7 @@ configure_hosts(){
 
 # $1: chroot
 configure_plymouth(){
-	if ${is_plymouth};then
+	if ${plymouth};then
 		msg2 "Setting plymouth $plymouth_theme ...."
 		sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" $1/etc/plymouth/plymouthd.conf
 	fi

lib/util-iso.sh

@@ -521,14 +521,6 @@ load_pkgs(){
 	fi
 }
 
-check_plymouth(){
-	is_plymouth=false
-	source mkinitcpio.conf
-	for h in ${HOOKS[@]};do
-		[[ $h == 'plymouth' ]] && is_plymouth=true
-	done
-}
-
 check_custom_pacman_conf(){
 	if [[ -f pacman-${pacman_conf_arch}.conf ]]; then
 		pacman_conf="pacman-${pacman_conf_arch}.conf"
@@ -575,8 +567,6 @@ load_profile(){
 	mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}" -K)
 	work_dir=${chroots_iso}/$1/${arch}
 
-	check_plymouth
-
 	[[ -d ${work_dir}/root-image ]] && check_chroot_version "${work_dir}/root-image"
 }
 

lib/util.sh

@@ -413,6 +413,10 @@ load_profile_config(){
 
 	[[ -z ${multilib} ]] && multilib="true"
 
+	[[ -z ${pxe_boot} ]] && pxe_boot="true"
+
+	[[ -z ${plymouth} ]] && plymouth="true"
+
 	[[ -z ${nonfree_xorg} ]] && nonfree_xorg="true"
 
 	[[ -z ${default_desktop_executable} ]] && default_desktop_executable="none"