git: 94b86c12f14e - main - release: de-duplicate arm.subr fstab logic
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Feb 2024 15:17:25 UTC
The branch main has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=94b86c12f14e69ace1bffe23c15c77a7def23216
commit 94b86c12f14e69ace1bffe23c15c77a7def23216
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2024-02-14 15:11:41 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-02-14 15:16:54 +0000
release: de-duplicate arm.subr fstab logic
These days, the entries are the identical for GPT and MBR.
Reviewed by: manu, karels, imp
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D43847
---
release/tools/arm.subr | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 2a3a278fbee6..6c53724ed52f 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -199,18 +199,10 @@ arm_install_base() {
echo '# Custom /etc/fstab for FreeBSD embedded images' \
> ${CHROOTDIR}/${DESTDIR}/etc/fstab
- 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" \
- >> ${CHROOTDIR}/${DESTDIR}/etc/fstab
- fi
- if [ "${PART_SCHEME}" = "MBR" ]; then
- echo "/dev/ufs/rootfs / ufs rw 1 1" \
- >> ${CHROOTDIR}/${DESTDIR}/etc/fstab
- echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \
- >> ${CHROOTDIR}/${DESTDIR}/etc/fstab
- fi
+ echo "/dev/ufs/rootfs / ufs rw 1 1" \
+ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab
+ echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \
+ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab
echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" \
>> ${CHROOTDIR}/${DESTDIR}/etc/fstab