From nobody Thu Mar 2 18:18:30 2023 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 4PSK9M1h4Hz3w6RM; Thu, 2 Mar 2023 18:18:31 +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 4PSK9M0xqYz3Mjt; Thu, 2 Mar 2023 18:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781111; 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=cCXHcVJ72ObxzLnS1QryTO65W2kz1Zr8M0lXEnaio2I=; b=pJcM0pfEULLVe7Iv3RKAzFgPUkNDJ3aSkH/qLL3QQNh03sIGr7rzAmGwcw7X6Ynsv+TtJC HirN9XhcMSJJKeFyheNELl0T50G0YGr5IudOUGxVgr6F7GOkWeAfCzhqdbJw+kA145ISZx bPV7ZXtEz28CpFIk+9pbxcVz0bi8L9VehCtcLeWWnHdWXPBNeqTQGCVKo+aDPv3kNvwa/j ymkHx3HseoJf2sUIHP5m7OSkuNh0aEFM0FKi5dT7xjraaDOhOxluJVBqXz64mOy50MYlgI nUu8XrFls3c2Is2jeAxihsRxxnHoMq4LxaNQvV3MX8Efm8c08NODSJTtEnrAFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781111; 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=cCXHcVJ72ObxzLnS1QryTO65W2kz1Zr8M0lXEnaio2I=; b=TiUTg1x1c8p2cIoZJDvfSUHLQtA5CDZKwLheIioyql2vCir2jC2aVU6CTfrHCo46o6RppA Ml1/s5OOFKA4TWZgh2RrZGJQgc2UqnzKYIKkDUuIpr7xu2CXrmz0kYAi6uy+WwxD4aeACK 3ySACELzSLmf/fRa69sL4NwgDtxoDcu6J5/Yx+0buDRiQ2Yh0BZWUgZU/F65fX4/phLRbk IOHF18bHcJBfPpkZ1Je8MfBRNIhlBRvo4nA0wDy2or7R7JVk2n2An80HHjUqP7ZL2ZJfnV uOKI/T/4ccWwxbucOxesQx/GhYhHKjGPscHsL9jwQr8inKHlyrXSJrAXNSzlGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781111; a=rsa-sha256; cv=none; b=rH3A/XVEHjyR+biMVG3rJb6EMyYyTWl8gdQqxBgrMqfs3aEwMG9F8xm9D+WG7+wh6sooTe sf+ow4LBlJcjITLvBkC0cLowx8Bk1EuLu+rvr96rfUwsktCsW11+oShaSSwkFEe7SvLEcl Vb+y0IPSqedZceiy6qK+lcnFXyJRZb50qxubXv7mIkmaEZOerFGY5XE0QvsqDBPPAi/4lS uk1ddf/i6hI2RYVS4xAdUX1KqCvT+jyS3k+oDlsxgOa0UXeaIv8GNyNk23rDPupmKfpUu7 p39F+VXJcxGgXg6gtwCpL8ktbt3IxK+jckzdnOa3aIS8xKjMag/PfGr+liRkqw== 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 4PSK9M00gqzQW2; Thu, 2 Mar 2023 18:18:31 +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 322IIUp8035392; Thu, 2 Mar 2023 18:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IIUbT035391; Thu, 2 Mar 2023 18:18:30 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:30 GMT Message-Id: <202303021818.322IIUbT035391@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: 3a616b10d8f7 - main - kboot: Better default boot device 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: 3a616b10d8f7bb0f1af7d6a971bdfbabdfecd896 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3a616b10d8f7bb0f1af7d6a971bdfbabdfecd896 commit 3a616b10d8f7bb0f1af7d6a971bdfbabdfecd896 Author: Warner Losh AuthorDate: 2023-03-02 17:55:06 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:09 +0000 kboot: Better default boot device Provide a better message when we can't find a boot device. Sponsored by: Netflix --- stand/kboot/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index 1cc4c0531772..e01507323bad 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -232,23 +232,22 @@ main(int argc, const char **argv) bootdev = getenv("bootdev"); if (bootdev == NULL) bootdev = hostdisk_gen_probe(); - if (bootdev == NULL) - bootdev="zfs:"; hostfs_root = getenv("hostfs_root"); if (hostfs_root == NULL) hostfs_root = "/"; #if defined(LOADER_ZFS_SUPPORT) - if (strcmp(bootdev, "zfs:") == 0) { + if (bootdev == NULL || strcmp(bootdev, "zfs:") == 0) { /* * Pseudo device that says go find the right ZFS pool. This will be * the first pool that we find that passes the sanity checks (eg looks * like it might be vbootable) and sets currdev to the right thing based * on active BEs, etc */ - hostdisk_zfs_find_default(); - } else + if (hostdisk_zfs_find_default()) + bootdev = getenv("currdev"); + } #endif - { + if (bootdev != NULL) { /* * Otherwise, honor what's on the command line. If we've been * given a specific ZFS partition, then we'll honor it w/o BE @@ -256,6 +255,8 @@ main(int argc, const char **argv) * boot than the default one in the pool. */ set_currdev(bootdev); + } else { + panic("Bootdev is still NULL"); } printf("Boot device: %s with hostfs_root %s\n", bootdev, hostfs_root);