Author: manu
Date: Fri Jun 19 19:25:47 2020
New Revision: 362414
URL: https://svnweb.freebsd.org/changeset/base/362414
Log:
MFC r361980, r362010
r361980:
release: amd64 efi boot name is bootx64
efi_boot_name is just used for arm image so no harm done.
Reported by: gonzo
r362010:
release: Fix arm GPT image
msdosfs labels are capitalized, use EFI instead of efi.
Modified:
stable/12/release/release.sh
stable/12/release/tools/arm.subr
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/release/release.sh
==============================================================================
--- stable/12/release/release.sh Fri Jun 19 19:24:36 2020
(r362413)
+++ stable/12/release/release.sh Fri Jun 19 19:25:47 2020
(r362414)
@@ -368,7 +368,7 @@ efi_boot_name()
echo "bootaa64.efi"
;;
amd64)
- echo "bootx86.efi"
+ echo "bootx64.efi"
;;
esac
}
Modified: stable/12/release/tools/arm.subr
==============================================================================
--- stable/12/release/tools/arm.subr Fri Jun 19 19:24:36 2020
(r362413)
+++ stable/12/release/tools/arm.subr Fri Jun 19 19:25:47 2020
(r362414)
@@ -194,7 +194,7 @@ arm_install_base() {
if [ "${PART_SCHEME}" == "GPT" ]; then
echo "/dev/ufs/rootfs / ufs rw 1 1" \
>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
- echo "/dev/msdosfs/efi /boot/efi msdosfs rw,noatime 0 0" \
+ echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \
>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
fi
if [ "${PART_SCHEME}" == "MBR" ]; then
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
