From nobody Thu Feb 10 19:44:00 2022 X-Original-To: dev-commits-src-all@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 2735E19A92A1; Thu, 10 Feb 2022 19:44:01 +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 4JvnHh5DQgz3GsB; Thu, 10 Feb 2022 19:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644522240; 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=8nqehO4GoQXyYw0dnJ2RKx+F8+hNNqsCP+NoQ/Xu4cg=; b=Wr4fuNSfKReu7ALE0fjyg9RepNrKZsg4XiwnYosCB//A7t1jOcVNpMgQSmcOt5TT2rPuMV wJUNHd1uG4VEuB7c/aIKmC49SsPgD3XM213fEcwdJ4pcp+WuC3WqBRzslsW59mnU/xSDbO qDLUH/1UGmOKIQ4Tt285w3nhaOYfo+2hjPLN+Vut5Ji3UmLUpm7qMWy07Oy29Tgwy25HC2 qUoexuqbuHs77Zy2pE9bcxu8031EOPoMkqaVPOCwLd2ZRyLuoY0ONRHdfkD8rAGFmsS4eV Qwxruhz440sn88RN5ie5yXLXzHkGllr42fFhWG+3mx5uteJrwDZmSg696L025A== 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 65A03268FC; Thu, 10 Feb 2022 19:44:00 +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 21AJi04l035557; Thu, 10 Feb 2022 19:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AJi07S035556; Thu, 10 Feb 2022 19:44:00 GMT (envelope-from git) Date: Thu, 10 Feb 2022 19:44:00 GMT Message-Id: <202202101944.21AJi07S035556@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: 0853415963c0 - main - nanobsd: Recursively copy fat partition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0853415963c0b24a24abc7a13bfa4117b35c8a37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644522240; 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=8nqehO4GoQXyYw0dnJ2RKx+F8+hNNqsCP+NoQ/Xu4cg=; b=pWs9oZ21ufBufkgDojLl3V+E6LoGw1jOyDQm/xIms4F2O9JnG2oc4WhgMAzrhzdZMPHrDL LQerAs7ZBBLrvfbDk8zk0idUVVPpGwN0mkt6I/+MtGylLumROp3JiE0iHe3z86r/cH6u3v daSZsVwERMcBxq/pfPub1xLvMULbY8ACKSBvwXLBYTKM3BeIM2/R+q2cwfaFehxJGIKEOG yGlynwW/UBe5ZOZ20Moj+bPCYL+tE5wY0eyC8x7R7w53PmG7UX/fIzr0DOqeHxtue7YQxB QqzDs++LwRk2U9CyI2/IBNL5fdwK+PJu/c+9thti7QN3f1BjNB5ey2XR32yWPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644522240; a=rsa-sha256; cv=none; b=rcwFiWK1xJ2+qFKHBzaa1fFsGsIYFonhL4YFX+QjSZG9g0ykLfqatUy45OaW8hELjYW1SP MNctrpLfEHmbUlk2kCsPIBwF/0LP+QICCp6cmlf6lHha4AXVfMjj4P5NDuSqFZztoZY6Ut +VojuP83O/7lYpWB/lk2FXaheL85tReKBvgez19a02FB/BXGK1y2W4MgIPpgxKd+V12ZVG xydwoy5ean3J2WGJbSuM8Fp//HaGBKjJh80qWaShmPF8PY796WS9P0uU/YLI7B5KBTx99R 9FUweZhCIhqcj0CBKYv2H0OG838HtkyO4GUvLjNJfEpMpSMxEy4RQZYi6f75dQ== 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=0853415963c0b24a24abc7a13bfa4117b35c8a37 commit 0853415963c0b24a24abc7a13bfa4117b35c8a37 Author: Jose Luis Duran AuthorDate: 2022-02-10 19:42:25 +0000 Commit: Warner Losh CommitDate: 2022-02-10 19:43:19 +0000 nanobsd: Recursively copy fat partition We have a directory structure for the FAT partition now with EFI and DTC overlays, so we need to recursively copy it. Differential Revision: https://reviews.freebsd.org/D34241 --- tools/tools/nanobsd/embedded/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 2d60940038a9..3998764311bb 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -217,7 +217,7 @@ create_diskimage_mbr ( ) ( if [ -d ${NANO_FAT_DIR} ]; then # Need to copy files from ${NANO_FATDIR} with mtools, or use # makefs -t msdos once that's supported - mcopy -i ${NANO_LOG}/_.${NANO_SLICE_FAT} ${NANO_FAT_DIR}/* :: + mcopy -s -i ${NANO_LOG}/_.${NANO_SLICE_FAT} ${NANO_FAT_DIR}/* :: fi fi