From nobody Wed May 22 22:11:19 2024 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 4Vl59j5tfJz5L6vb; Wed, 22 May 2024 22:11:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vl59j5Nzdz4QYV; Wed, 22 May 2024 22:11:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716415881; 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: in-reply-to:in-reply-to:references:references; bh=mqqsY36mTXOls3vfPYpN1yF1EmfUYwFRyPn1z1M7Vfg=; b=kCpnGnaJ5v7F/Dl49RMpj3/eTj55NysOhwgBpUbrtHDi6KdZr1K2gnXuxhwJFTxN1wO1I8 GWzDAvgjhJw0DvnpPYei/ePc8CBvPSEvhAufKSAsVMRb8Aat/Tfg8LNpbyOvpWIas5kNTg kme8Om1vlVWViEVn/16hcGcLaXOwEHcYi2/HuewOqJflWsqKAbW9Axpe3/tbdYHSrISkgu YDpvRWcNxT0LD9nLqsfO+ebxlkYwOaR9QCBp8hH/1f336UnZQHzFji0Ae8ZvVGp4IyCEJW JChm9q3KpxATkf9LXAfWPQEnbxH8EnjL7mfeS+44z34hF9rAOwZFhRjgyL/oLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716415881; a=rsa-sha256; cv=none; b=aBZsqDPq+Fyu3sb8ugGssQfIiyq4pxqZx3FWlDqcjGv5LiqqUD1ZxNZQVKIK7WfRjjo7Zw dRF7aKHLMAMGD1kPbrrU/zqru/0MF/hhr0blnK8ZEqGCbAM0qJmgHr4YoNa3YK6rKs73GQ QXo0HuL43qibKg7EHFQb1TN+4pR3ODKoaDKtgMn6de88FUxhlux4suOPWabjqV0Dwmofz4 KvIcX1VdFu7xoWeQmL0e4mvfNbK0CDnFaz8JHZ3MqSGFfR6On7kA/6ubxasPC8f/t31Xl7 /bDdqam+spDT6twgkNIptbOvwGyHOgNwhyDdNWkCM31GQDicQSbUwmQ+QCv+UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716415881; 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: in-reply-to:in-reply-to:references:references; bh=mqqsY36mTXOls3vfPYpN1yF1EmfUYwFRyPn1z1M7Vfg=; b=WIXhIXt30zUuWqSL6iJTtH1mnKaSLjHHheUgGWW3+FxpQSb7PeeIkpA9377W70VpG2/rM4 ZzjMU/EfFk7uqfP0fpTlE4pxhBQTKZWVzLHjgdf/iFkii6SB1TpIhEC5aL0iAZakb++Ug2 LMHPXesAmowuygjVlNqi/nDCondpOssDVoBIZOsIlK6VNpcu7jlS8t/qo3IRWQfbG1+bOd k0+hKIBqRMh7VY4/hYkYHcjaHXcJiRQE6Nt38L/UZwHCSi23qlEZmlExMguezLbHlMgNgK tc5E7phjaEaOHl48Mc+kv7XiqvRXvMZrMw94rDdp6//UFL0qn+1C0hW2R3ElBA== Received: from [IPV6:2601:644:937f:4c50:b136:2176:fd7d:9c11] (unknown [IPv6:2601:644:937f:4c50:b136:2176:fd7d:9c11]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Vl59j1qN5z185h; Wed, 22 May 2024 22:11:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <6d6df2f4-547e-48bf-a99f-a26859c5c51f@FreeBSD.org> Date: Wed, 22 May 2024 15:11:19 -0700 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 0c3ade2cf13d - main - nextboot: fix nextboot -k on ZFS Content-Language: en-US To: Gleb Smirnoff , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202402200354.41K3sPeT025629@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202402200354.41K3sPeT025629@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/19/24 7:54 PM, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0c3ade2cf13df1ed5cd9db4081137ec90fcd19d0 > > commit 0c3ade2cf13df1ed5cd9db4081137ec90fcd19d0 > Author: Gleb Smirnoff > AuthorDate: 2024-02-20 03:51:22 +0000 > Commit: Gleb Smirnoff > CommitDate: 2024-02-20 03:51:22 +0000 > > nextboot: fix nextboot -k on ZFS > > zfsbootcfg(1) expects pool name to operate on, not currently mounted > filesystem name. > > Fixes: fd6d47375a78fbf0737012b7cc11180291781e8b > --- > sbin/reboot/reboot.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c > index 7ea4d50eaf74..ac3927cc2432 100644 > --- a/sbin/reboot/reboot.c > +++ b/sbin/reboot/reboot.c > @@ -130,6 +130,11 @@ write_nextboot(const char *fn, const char *env, bool force) > } > > if (zfs) { > + char *slash; > + > + if ((slash = strchr(sfs.f_mntfromname, '/')) == NULL) > + E("Can't find ZFS pool name in %s", sfs.f_mntfromname); > + *slash = '\0'; > zfsbootcfg(sfs.f_mntfromname, force); This broke nextboot -k on my systems using ZFS (was working fine prior to this commit): # nextboot -k test nextboot: Can't find ZFS pool name in head: No error: 0 # zpool list NAME SIZE ALLOC FREE CKPOINT EXPANDSZ FRAG CAP DEDUP HEALTH ALTROOT head 79.5G 36.2G 43.3G - - 41% 45% 1.00x ONLINE - # zfs list NAME USED AVAIL REFER MOUNTPOINT head 36.2G 40.8G 2.16G legacy head/public 1.13G 40.8G 1.13G legacy head/tmp 836M 40.8G 836M legacy head/usr 28.3G 40.8G 2.34G legacy head/usr/local 534M 40.8G 534M legacy head/usr/obj 21.4G 40.8G 21.4G legacy head/usr/ports 23K 40.8G 23K legacy head/usr/src 4.00G 40.8G 4.00G legacy head/var 3.83G 40.8G 266M legacy head/var/crash 3.57G 40.8G 3.57G legacy head/var/tmp 23K 40.8G 23K legacy I think we should just punt on the error and pass the entire string again if slash is NULL. I'll test this locally and put it in a review if it works. -- John Baldwin