diff --git a/bin/buildiso.in b/bin/buildiso.in
index 863b9b9..26374e1 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -25,7 +25,6 @@ show_profile(){
if ${verbose};then
msg2 "autologin: %s" "${autologin}"
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
- msg2 "pxe_boot: %s" "${pxe_boot}"
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
diff --git a/bin/check-yaml.in b/bin/check-yaml.in
index 3c7bed6..b8ff096 100644
--- a/bin/check-yaml.in
+++ b/bin/check-yaml.in
@@ -26,7 +26,6 @@ show_profile(){
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
msg2 "autologin: %s" "${autologin}"
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
- msg2 "pxe_boot: %s" "${pxe_boot}"
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
diff --git a/data/profile.conf.example b/data/profile.conf.example
index 817ebd3..c6efca9 100644
--- a/data/profile.conf.example
+++ b/data/profile.conf.example
@@ -5,9 +5,6 @@
# use multilib packages; x86_64 only
# multilib="true"
-# use pxe
-# pxe_boot="true"
-
# use extra packages as defined in pkglist to activate a full profile
# extra="false"
diff --git a/docbook/profile.conf.xml b/docbook/profile.conf.xml
index e45ae1a..2ae5391 100644
--- a/docbook/profile.conf.xml
+++ b/docbook/profile.conf.xml
@@ -117,15 +117,6 @@ along with systemd; If not, see .
-
- pxe_boot=
-
- Accepts
- (the default)
- .
-
-
-
multilib=
diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index a8cd98c..3a0de50 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -9,14 +9,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-set_mkinicpio_hooks(){
- if ! ${pxe_boot};then
- msg2 "Removing pxe hooks"
- sed -e 's/miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs //' \
- -e 's/memdisk //' -i $1
- fi
-}
-
prepare_initcpio(){
msg2 "Copying initcpio ..."
cp /etc/initcpio/hooks/miso* $1/etc/initcpio/hooks
@@ -26,7 +18,6 @@ prepare_initcpio(){
prepare_initramfs(){
cp ${DATADIR}/mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
- set_mkinicpio_hooks "$1/etc/mkinitcpio-${iso_name}.conf"
local _kernver=$(cat $1/usr/lib/modules/*/version)
if [[ -n ${gpgkey} ]]; then
su ${OWNER} -c "gpg --export ${gpgkey} >${USERCONFDIR}/gpgkey"
@@ -63,26 +54,26 @@ vars_to_boot_conf(){
prepare_grub(){
local src=i386-pc app='core.img' grub=$2/boot/grub efi=$2/efi/boot \
data=$1/usr/share/grub lib=$1/usr/lib/grub
-
+
prepare_dir ${grub}/${src}
-
+
cp ${data}/cfg/*.cfg ${grub}
-
- vars_to_boot_conf "${grub}/grub.cfg"
-
+
+ vars_to_boot_conf "${grub}/kernels.cfg"
+
cp ${lib}/${src}/* ${grub}/${src}
-
+
msg2 "Building %s ..." "${app}"
-
+
local mods=(iso9660 normal extcmd boot bufio crypto gettext terminal multiboot configfile linux linux16)
-
+
grub-mkimage -d ${grub}/${src} -o ${grub}/${src}/core.img -O ${src} -p /boot/grub biosdisk ${mods[@]}
cat ${grub}/${src}/cdboot.img ${grub}/${src}/core.img > ${grub}/${src}/eltorito.img
-
- case ${target_arch} in
- 'i686')
- src=i386-efi
+
+ case ${target_arch} in
+ 'i686')
+ src=i386-efi
app=bootia32.efi
;;
'x86_64')
@@ -90,32 +81,32 @@ prepare_grub(){
app=bootx64.efi
;;
esac
-
+
prepare_dir ${efi}
prepare_dir ${grub}/${src}
-
+
cp ${lib}/${src}/* ${grub}/${src}
-
+
msg2 "Building %s ..." "${app}"
- grub-mkimage -d ${grub}/${src} -o ${efi}/${app} -O ${src} -p /boot/grub ${mods[@]}
-
+ grub-mkimage -d ${grub}/${src} -o ${efi}/${app} -O ${src} -p /boot/grub ${mods[@]}
+
prepare_dir ${grub}/themes
cp -r ${data}/themes/${iso_name}-live ${grub}/themes/
cp ${data}/unicode.pf2 ${grub}
cp -r ${data}/{locales,tz} ${grub}
-
+
local size=8M mnt="${mnt_dir}/efiboot" img="$2/efi.img"
msg2 "Creating fat image of %s ..." "${size}"
truncate -s ${size} "${img}"
mkfs.fat -n MISO_EFI "${img}" &>/dev/null
mkdir -p "${mnt}"
mount_img "${img}" "${mnt}"
-
+
prepare_dir ${mnt}/efi/boot
-
+
msg2 "Building %s ..." "${app}"
grub-mkimage -d ${grub}/${src} -o ${mnt}/efi/boot/${app} -O ${src} -p /boot/grub ${mods[@]}
-
+
umount_img "${mnt}"
}
diff --git a/lib/util.sh b/lib/util.sh
index b0c96b4..4458a86 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -375,8 +375,6 @@ load_profile_config(){
[[ -z ${multilib} ]] && multilib="true"
- [[ -z ${pxe_boot} ]] && pxe_boot="true"
-
[[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
[[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub"
@@ -447,7 +445,6 @@ reset_profile(){
unset displaymanager
unset autologin
unset multilib
- unset pxe_boot
unset nonfree_mhwd
unset efi_boot_loader
unset hostname