Unified · Split
| @@ -158,14 +158,16 @@ info_msg "Install kernel and additional required netboot packages" · 157 unmodified lines | ||
| 158 | 158 | # dracut-network provides the in-initrd network stack dialog is needed |
| 159 | 159 | # by the install environment. ${INITRAMFS_COMPRESSION} is the name of |
| 160 | 160 | # the compressor we want to use (lz4 by default). |
| 161 | −if [ -z "${XBPS_TARGET_ARCH}" ] ; then | |
| 161 | +if [ -z "${XBPS_TARGET_ARCH##*x86*}" ] ; then | |
| 162 | 162 | # This platform is x86 or compatible, we should use |
| 163 | 163 | # syslinux/pxelinux to boot the system. |
| 164 | + info_msg "Selecting syslinux bootloader" | |
| 164 | 165 | bootloader_pkg=syslinux |
| 165 | 166 | else |
| 166 | 167 | # This is likely an arm platform of some kind. In general these |
| 167 | 168 | # either have u-boot or a u-boot compatible loader, so we'll use |
| 168 | 169 | # that to produce a uImage and a uInitrd |
| 170 | + info_msg "Selecting u-boot bootloader" | |
| 169 | 171 | bootloader_pkg=uboot-mkimage |
| 170 | 172 | fi |
| 171 | 173 | run_cmd_target "xbps-install $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -Sy ${KERNELPKG-linux} dracut binutils dracut-network dialog ${INITRAMFS_COMPRESSION-xz} ${bootloader_pkg}" |
| @@ -194,7 +196,7 @@ run_cmd_chroot "$ROOTFS" "env -i /usr/bin/dracut \ · 22 unmodified lines | ||
| 194 | 196 | [ $? -ne 0 ] && die "Failed to generate the initramfs" |
| 195 | 197 | |
| 196 | 198 | info_msg "Collect netboot components" |
| 197 | −if [ ${bootloader_pkg} == "syslinux" ] ; then | |
| 199 | +if [ ${bootloader_pkg} = "syslinux" ] ; then | |
| 198 | 200 | # The whole point of this endeavor is to get the files needed for PXE. |
| 199 | 201 | # Now that they have been generated, we copy them out of the doomed |
| 200 | 202 | # ROOTFS and into the $BOOT_DIR where we're staging the rest of the |