From nobody Mon May 16 15:25:08 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 037031AE3C63; Mon, 16 May 2022 15:25:09 +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 4L23385vK9z3nlc; Mon, 16 May 2022 15:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652714708; 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=M8hYCIBSnB01vwwqLw9d7PqB1LInwp9/eevt4nPbDxA=; b=tL0iY95s7yEQpEFiuaEyLzu+Nnd4oFGHdRGwmFfLH+b8RUxvWATp93Bfm4uOB6PN0jRNZU yuubYE78/Bshxon194cUMidffTgqVjWu/1iUbKP/UnLB9d5mRzqtG9LNlt5klwCwd0GPRK OBiN7KpCXJA8Dz+l1+LY1isShlKuE/BN2m0g/4/gFescFTIZd5r7omwf4VniNRvuAxbgl6 rwXG8IgmcQS6lx79JeVIAbC5BwDfQNbtqyUXHVQwRHweluVSm7X0i4YZObdy+3qbuf2lar UlDKlVquG96jVvvnpjjrMS78R43pZg4qgoqPaoTR2EUaVCWxRJB5ilGgIciVBg== 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 A791322B0C; Mon, 16 May 2022 15:25:08 +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 24GFP8Hp006818; Mon, 16 May 2022 15:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GFP8RW006817; Mon, 16 May 2022 15:25:08 GMT (envelope-from git) Date: Mon, 16 May 2022 15:25:08 GMT Message-Id: <202205161525.24GFP8RW006817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 95c6bc5a03b9 - stable/13 - bsdinstall/script: umount before zpool export 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95c6bc5a03b9d1326978f2aed5d7e944d6eeb745 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652714708; 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=M8hYCIBSnB01vwwqLw9d7PqB1LInwp9/eevt4nPbDxA=; b=T7ypK6NqEKzOwKhXn2P39vCfbNXw0iOoYu7xW1EJxIRPJy0sTmE96OEXyMp67oJ5ewdKqs 6trqpK9gaNjEVPGQMuMYotEfEml+hhvmUdnjirykmw9vPx+SdqQVqQNM/IdNLjsljVrTed PfrptWZA1gHqh6wSCyx/hVVb0Q8QQ9bAIjz+CSbzdMDhzF1OLl+20tIv3EZjBrk9ipnmuz pVCijX5zQ3/nMykU9jS8XLmBWAjxeX1lKDnbwT50fAEm6y6ElS0cVkDpHsB5HWO2u0sNR5 nufGOPHSOADxbeaHjm5lc44OBKrZ2xzpUZvtcVh4QV84YOjSX2x91+/YOrXJew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652714708; a=rsa-sha256; cv=none; b=W/uVBdOHXflRgHER+jMLgnnDuz+vHV7LUA2lnxfN70KvuCzs0ALC5Wo8MMNRwFolmgEvD4 S4MYmhKx+WBoEtP8sp41dbpzY5wB/pZXhXGndoG69w5bJFs0WbWkvb4c50xR/GkU40goo3 shv1Tl0WmnJSlc+0bPJbDhVZoK+JTfjlx9u7I4BuVD+mM90W2bzmdAqUYsa2MQq9tlnxWD zV8SWJVL0pTGlsS6lhMVZ36cucaYqbEFq+I7hdQmrEKlywwwdljDU7ZXgcUrVqZkse4/O7 O5YwRL1bjELTDE8Rbs3atrZgYBBYDX6vBf04hSwuWPP+S896awfw0a8M0pUleA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=95c6bc5a03b9d1326978f2aed5d7e944d6eeb745 commit 95c6bc5a03b9d1326978f2aed5d7e944d6eeb745 Author: Corvin Köhne AuthorDate: 2022-05-03 14:01:22 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 15:24:56 +0000 bsdinstall/script: umount before zpool export When running zpool export first, boot/efi and dev is still mounted so zpool export fails. By running bsdinstall umount first the pool can be cleanly exported. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D35114 Sponsored by: Beckhoff Automation GmbH & Co. KG MFC After: 3 days (cherry picked from commit 450b4ac23c75e2dde996c96049c0887864e22d09) --- usr.sbin/bsdinstall/scripts/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 92332241f348..24469589d1a5 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -168,10 +168,10 @@ if [ -f $TMPDIR/bsdinstall-installscript-ab ]; then fi bsdinstall entropy +bsdinstall umount if [ "$ZFSBOOT_DISKS" ]; then zpool export $ZFSBOOT_POOL_NAME fi -bsdinstall umount f_dprintf "Installation Completed at %s" "$( date )"