From nobody Mon Aug 15 18:47:37 2022 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 4M63Dn640tz4YXjN; Mon, 15 Aug 2022 18:47:37 +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 4M63Dn5Xydz47jp; Mon, 15 Aug 2022 18:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660589257; 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=Gzd5loXWRoDnHjY23+n3wVKerPEfC7cShd0Q/c9gikY=; b=T2oL1e8lVrEp+Dp8KBom7fA1LiBnNiEcksHM75AWFSc5neX8AucqMQgDDH+UgV4wbj8Pu1 b5ZLs7TRx1ZeLEDNYxQ9hLG6whih09v7YgSEiuZV0U/4MjExwGYWjD1xpeHRD8rLo8N/xe uktCQD4NlEO2+eNw4HG/6r2XJSPCl9XwRe53bC3FMh4WiDXuQqyNU2cplmZWSjDby7dfrw Vn7Lrc0l4Tjh7x95+dfhrxd2LrDcT4zuvOMrJf9190Peqeo4FC0tPnT7Hjza8Gx9N3s2Bx xyQH0ueaM+A5AMmHBUgiMUC/hG1+GR9k01KPTDnXzDmvsnkvOE7ki3Nl+YAR4A== 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 4M63Dn4g37zgQH; Mon, 15 Aug 2022 18:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27FIlbo2027251; Mon, 15 Aug 2022 18:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FIlbvd027250; Mon, 15 Aug 2022 18:47:37 GMT (envelope-from git) Date: Mon, 15 Aug 2022 18:47:37 GMT Message-Id: <202208151847.27FIlbvd027250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 729c458bf7cc - main - stand: Abstract out fstab creation 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 729c458bf7cc4ff7df616617b6ac5f4b83537dc3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660589257; 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=Gzd5loXWRoDnHjY23+n3wVKerPEfC7cShd0Q/c9gikY=; b=sGeiZ5yg7TI11Jfw5ADaLUYEvfl4EssmylRLq5gYdiqxqEM+7a2j09a+VAnH2h08LxVEQD 5ni3ezFHjHW8AKDAX7hJ7HT6RGDSPG/NZU6Ep35mXP/k66p1QaitVaQyP9huR+XyY4kNV5 QtIYbMwtByx2tqLbnPT8xyCiu/OaP/6cNNeEYhOJqdm9/mXUri3RvBrygsTzmuP8/WrVtX uHfsUPrZDkbVCL17WihiEe6/TQEW4MFs0x//wHUXF9pNIDnA86cgJCpnDhk4xsT2ph2Wpe MqU8P4/rUwboIelj2gHhtFDwhumzSEYvNSyp1UgVnjO4Akd0nqJi0WYbq+FLVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660589257; a=rsa-sha256; cv=none; b=eHcsZCItj3rcx4oH7tu43lKn9J0unJ8wFmvj5hZA5iHcrlOlxL/zkTez+qZsRB++T+ggmI gnJH0cfXFXEOqSuq/86EU/St9zyY19MikjyPDmUegZ8epWbSkqd+8v3lGI3G5WLtO0SQST bUQfGzwQzkzourf8gGYIBZDgAv/Ru7xzovfRN6s0VzPg4r9rxCGhHGFA8yIvTiTDYtqDWd HvygLD1LcZ84ptipXNVZjohXaXMuGjhDRcekybnsgte/uJYax8BQU65AndMx021uS4e7Xy TMTswyVKReXMbmh9K6A2eA0TQGi7CTy4K7mOAt2uR0EviekJgDd9uACviIWipg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=729c458bf7cc4ff7df616617b6ac5f4b83537dc3 commit 729c458bf7cc4ff7df616617b6ac5f4b83537dc3 Author: Warner Losh AuthorDate: 2022-08-15 18:32:12 +0000 Commit: Warner Losh CommitDate: 2022-08-15 18:46:31 +0000 stand: Abstract out fstab creation Now that all the fstabs are the same, abstract it out into a function. Sponsored by: Netflix --- tools/boot/rootgen.sh | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index bcf0aa92419f..80554fb1b77d 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -34,13 +34,19 @@ cpsys() { (cd $src ; tar cf - .) | (cd $dst; tar xf -) } -mk_nogeli_gpt_ufs_legacy() { +ufs_fstab() { src=$1 - img=$2 cat > ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${mntpt}/boot/loader.conf < ${mntpt}/etc/fstab < ${mntpt}/boot/loader.conf < ${mntpt}/etc/fstab < ${mntpt}/boot/loader.conf < ${mntpt}/etc/fstab <