From nobody Mon Feb 26 15:36:09 2024 X-Original-To: dev-commits-src-branches@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 4Tk4TQ0kNzz5BbtZ; Mon, 26 Feb 2024 15:36:10 +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 4Tk4TQ0Drtz4KSR; Mon, 26 Feb 2024 15:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708961770; 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=z011T0EMkTNSvzKuYAfLunJuBlVf7ObPfBxe35A9h9Q=; b=ARfsOX6KY0J380fShfM38aa7cIgIj8av+ORNRqy/O/Q4krtsJ9n6AGC4WG97YDUQTAqCuP TrkyoN9Uu04GVw+9d8/B2hytzBmC0YhvR4MLaurfNDow9bwhGQk29pBU409PHlr3M2nngG 8+YEtTZJg3ZhezDpp8ZDUQ/eKm8HN9HWt5m+qq6UfyTbKdDYXdR4ko7o50UWtMHGKQk9R5 UG81SKJ/0f3kQ6mdpnvTkVJ0s28Eb716w/DRp9P4GOxVq6WLWV5JOAbnOSxDci9btIuDm6 KMy0YDxGN6ls15LRPsxl1JGctW8cXw9iGf8y6JadH5KAYuHkh96pGBESSHF6dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708961770; a=rsa-sha256; cv=none; b=obJS1hjKq45Nr02CKCd4Gy2CSs/xs/KQqLr/JkWPQTawWlrR6ODW70+v09OxS/EhDt07hF 8ZvCpDDvEH8K0GlLMGLp0+UgD/0iSkWPXrPSd/HMYzqiy0tLB5ITskt/ujAIQa78euyJta 2k8q1BMEOIgQOaUVEil01okgCHspqeuxdKLYVAoBvpSOvvYmc9GzsNBqvZ9IGaZJ877Obu DJ1nkRIdZteIL0W4iA5tVQlkzlsnPM1Er83D+qscYvPFPJ4ct/50PAHmYt22pK2clG6tao BypqZujTuBcGRXoNI2uX9ITOSd8P/vDiOCpQpqO/RsW++3pY/BCnR2v/nzRsOQ== 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=1708961770; 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=z011T0EMkTNSvzKuYAfLunJuBlVf7ObPfBxe35A9h9Q=; b=rIA10wHPXt804K+kgN0UmaAammixnG+0edbocp1oPzeO8MjjnGB1NsHDJPfYsd7llMxYPx JVce0NYMigJ0Zw7c9/xU9L+rtGtNHgp4s/61vv/l799xWvUZA22EIpN/nPGaCoffRBO4eB 5wmu64W97WwYZIMNqUcIq42TZGcB+KdLZ8lSWGEiKFpyizDKmg3LjvFnB8T2sivM0pvUXV mTvISDJiNNLS3UtoLpBz4SPl3dGVCFO0vrHuCDyROvjiqJu6Gkr30YYau8p4JqhLGreVlB A8GWVQ2yYTQ399soM0+ZQTMypI3I1DuPhOIhfePQsAIyhl6PivqTU5nBi1MngA== 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 4Tk4TP6RfXzZQl; Mon, 26 Feb 2024 15:36:09 +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 41QFa9Q6022277; Mon, 26 Feb 2024 15:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QFa9JX022274; Mon, 26 Feb 2024 15:36:09 GMT (envelope-from git) Date: Mon, 26 Feb 2024 15:36:09 GMT Message-Id: <202402261536.41QFa9JX022274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7a3d7b29f83e - stable/14 - release: de-duplicate arm.subr fstab logic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a3d7b29f83ef8330978f6ccc3069df3e3f718db Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3d7b29f83ef8330978f6ccc3069df3e3f718db commit 7a3d7b29f83ef8330978f6ccc3069df3e3f718db Author: Mitchell Horne AuthorDate: 2024-02-14 15:11:41 +0000 Commit: Mitchell Horne CommitDate: 2024-02-26 15:35:47 +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 (cherry picked from commit 94b86c12f14e69ace1bffe23c15c77a7def23216) --- 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