From nobody Wed Feb 14 15:17:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZhdK3nNFz5B74x; Wed, 14 Feb 2024 15:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZhdK3GD8z3y7j; Wed, 14 Feb 2024 15:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707923845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zs1hpJFjKCo7ZYlv+UN9hKWoXJIg3nWHmaH90kq864=; b=iO0NSrJ3IqC1S20JxWGb9d581b/uYWqjHwZpOBdFH4LcCE01L5cla/WuR0N0pujQaXJVGU GsC8cpH++wzC1ygpxpeZM3zLUN98Xn5nU8D6h0FdhbXco8qkdnulaFeL7+AnPQ1HOhdjs7 q69aLmISGJ0VMzbupLc8N6bg3jl/+BgX924E4XH9NximMznIda1TG9gKURFDrsdeDRYYw9 20+Jfdj9a3oqvmdOSYYpw8AtW7wtctUSzBa4QKs3i4HxptahfiwLJJnTvOJw3hJmJnyxEU uQe4AlzoqaNhDGcKvrHOXT/bHLLYDQs1B/uiwgvnLmA9w7azFdBkDp/ga+Utkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707923845; a=rsa-sha256; cv=none; b=rBLBOk5Y4zFOAoAovaDRSo541L6ge2mK2nhNOL61Fk+fASMODEhiiyrFEA4n2CXkS/V6oj 16ve2jQfi5IN3A79NuC51+zcCx/8Z7Z6PP9VJ4MfcU79+5Z1xvQvgP67gax9HEX32LWqLV xSvGQo6J7CB84BiYipxRrL/6IHsR1t/lPKNHjpj7mzRDsMdYTGU7hQ+dwJ22tWzUhrjE1O esiYgJGYa5ovlsC8i+5R9JWneNqg+wq2iXrPb1R0c5eybLPZ7ny5opJYbYtqSo13mhQCJ4 sDpVs+CdRAfiWclbrOAsZFRirRwu6i4VGDq/z1a7MVVhDfVT/Gl7nERmvw3WGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707923845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zs1hpJFjKCo7ZYlv+UN9hKWoXJIg3nWHmaH90kq864=; b=gT4Xosbvc0cJZmXcl2nGGCMxKeS4VmXteMNQ3q+S1jVzLepKTmoLsLcnd3AFW8k+wDlvJc ZJcKO88XWRKSdKghz0kqfU4ew1fBO+M+WKy+vT2WjxmgZ6O4IXxfdI5zkmf6Z3tZENJarm ZEkAu3jVH0LqRaEmCJOgOGsuJFol59Mz/mtzJ8Ri1fdbYlOkpl93u3FZDgsBWKYFOUD2BT RKvihFr2LmLiAqJO0Myu6Wcihd8WDW69Fo2LD4K4P/pBXM+yAGSiFcLQcp+szK8Cj3Lwre 7Vulkf+vY9SGfiABbBp/GV7hz6zAmWddtFd192oV0Ipafz1TgK9X/NR2D2KJSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZhdK2ByKz13N1; Wed, 14 Feb 2024 15:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EFHP8n015184; Wed, 14 Feb 2024 15:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EFHPPi015181; Wed, 14 Feb 2024 15:17:25 GMT (envelope-from git) Date: Wed, 14 Feb 2024 15:17:25 GMT Message-Id: <202402141517.41EFHPPi015181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 94b86c12f14e - main - release: de-duplicate arm.subr fstab logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94b86c12f14e69ace1bffe23c15c77a7def23216 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=94b86c12f14e69ace1bffe23c15c77a7def23216 commit 94b86c12f14e69ace1bffe23c15c77a7def23216 Author: Mitchell Horne AuthorDate: 2024-02-14 15:11:41 +0000 Commit: Mitchell Horne 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