From nobody Sun Jun 26 08:15:48 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 C6E1F87023B; Sun, 26 Jun 2022 08:15:48 +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 4LW3Zr5DMgz4h8D; Sun, 26 Jun 2022 08:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656231348; 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=SNBkJD0A+2d06xDf2u/ON0hKZsF/ko+7jSulKRQOmz8=; b=sIbpDhMJxVvhdgGq4qjIjm99WpF5m29FcmjnhAf8+9OzyId4jqegJ9gPwjpz7bQ4so3DR5 AqrvRqyIQOaqotbGG0/pRe01om2NWRGyoD0avLI0anqp9WzUbhnfv8+oJTos1YgzU4Ownw R7ntf5XtEdtxXISTw9OjRwKe0JCa6toO768Bjhb2OzsPdwYxDqM+oGaI0PFk+tEBT3nQVK VNVtC036jyHdmQtf1NpT6zeWiLCygTJn79JwBj28FZ8wZTWdAGnbUcXgMF+rMlJccAVauo zrf7UHZ6rYYhVT/5y8MFR2XDnkpsK+wFPxzhsfHTjMCohjI5NdL2FgGQlwMRBA== 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 901A014005; Sun, 26 Jun 2022 08:15:48 +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 25Q8FmuQ064501; Sun, 26 Jun 2022 08:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25Q8Fmr5064500; Sun, 26 Jun 2022 08:15:48 GMT (envelope-from git) Date: Sun, 26 Jun 2022 08:15:48 GMT Message-Id: <202206260815.25Q8Fmr5064500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Toomas Soome Subject: git: 412c7437218a - stable/13 - userboot is missing vdisk_dev 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: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 412c7437218a287557e47bfab18f42358c25b6e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656231348; 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=SNBkJD0A+2d06xDf2u/ON0hKZsF/ko+7jSulKRQOmz8=; b=BTvFFHG+WoCDW2k2BIOUvJvlN2iOI2fN4B0QyX/4htobmW7SLkg/qSC/kcpW+3cInefVSC uj3rW6E8iB3L2miNos3cJhxT9mn6aF33dtErORW0/4FhUHXOQuSEaKys0QaNkRV0tXWAj2 Hke7MJrtIgA1RV5bSIuchCk8gie5ShFfMlCv41IPCBSTkLyO8uO+1/FEnN6VrEDvzr5SSN ZZQyXJrJJLlkQJ4quv7T7/98qKnt63UKtCzmvnlgOJ7p7sdYBY39SN3e38lHLpHWXYQeaT Dt4JvdW3wsKjgHOr4Uu17gjx94yq9VjNVluYgTYH73LBvpoqY6utYk7U5N+8NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656231348; a=rsa-sha256; cv=none; b=dMfki4aX83BTzSAC4KiTUXzq/41+AHBpqA+2t5tIiVuj2W6V97G3XFFAlbBxnfT36OxOXC t6XFDNpOPTUWst5FSQ9cmKEUINLJTT7uDXGsGcrSDBXU04/+QkxkV3IWOWLvrUePWn7LD3 pF8YQDiKJj80Xtyur4ZaI6hesFBQjlt9qnpnH47UyhQoTwPwE7VeWEIXobkVjvu+lY8ATK iUzvUJoGybPoebqQImnIitDhJ02cX62pdsxIuFIyjriLhm00uC8wR75KiXpq0Ni5xm324U hxKiCzhffGMnuUi9/7krlkLBvITnNOtm3x/vh68JqCnyEhv7IVPVEqAqxs52jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=412c7437218a287557e47bfab18f42358c25b6e8 commit 412c7437218a287557e47bfab18f42358c25b6e8 Author: Toomas Soome AuthorDate: 2022-06-09 06:56:19 +0000 Commit: Toomas Soome CommitDate: 2022-06-26 04:52:57 +0000 userboot is missing vdisk_dev Add vdisk device support in userboot configuration. (cherry picked fromcommit e368fb6eb6eb3041fa9f4c608377ddf90d33f11e) --- stand/userboot/userboot/conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c index af63528163d5..1846b9b74e3f 100644 --- a/stand/userboot/userboot/conf.c +++ b/stand/userboot/userboot/conf.c @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include "libzfs.h" #endif +extern struct devsw vdisk_dev; + /* * We could use linker sets for some or all of these, but * then we would have to control what ended up linked into @@ -55,6 +57,7 @@ __FBSDID("$FreeBSD$"); struct devsw *devsw[] = { &host_dev, &userboot_disk, + &vdisk_dev, #if defined(USERBOOT_ZFS_SUPPORT) &zfs_dev, #endif