git: 9f7ff9fe8450 - stable/13 - Remove tmpfs size and properly format generated fstab for arm

Emmanuel Vadot manu at FreeBSD.org
Sun Apr 11 19:32:53 UTC 2021


The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=9f7ff9fe8450497fa3ca6049a56a667dfd878899

commit 9f7ff9fe8450497fa3ca6049a56a667dfd878899
Author:     Daniel Engerg <daniel.engberg.lists at pyret.net>
AuthorDate: 2021-03-17 14:00:57 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-04-11 19:32:13 +0000

    Remove tmpfs size and properly format generated fstab for arm
    
    Remove tmpfs size limitation, this breaks make installworld and installation of some packages
    Format generated fstab using tabs to make it consistent and readable
    
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D29283
    
    (cherry picked from commit 5bffdafd6c5f2a8279a57172ab760ea66ed3d7d5)
---
 release/tools/arm.subr | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 2f91490c0859..811d6ddb402d 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -197,18 +197,18 @@ 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" \
+		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
-		echo "/dev/ufs/rootfs   /       ufs     rw      1       1" \
+		echo "/dev/ufs/rootfs		/		ufs	rw		1	1" \
 			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
-		echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \
+		echo "/dev/msdosfs/MSDOSBOOT	/boot/msdos 	msdosfs	rw,noatime	0	0" \
 			>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
 	fi
-	echo "tmpfs /tmp tmpfs rw,mode=1777,size=50m 0 0" \
+	echo "tmpfs			/tmp		tmpfs	rw,mode=1777	0	0" \
 		>> ${CHROOTDIR}/${DESTDIR}/etc/fstab
 
 	local hostname


More information about the dev-commits-src-branches mailing list