From nobody Tue Jun 17 11:55:14 2025 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 4bM50L6KSsz5yDRM; Tue, 17 Jun 2025 11:55:14 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bM50L52G0z3RFy; Tue, 17 Jun 2025 11:55:14 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750161314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kSyFZ7EiXindt81Yw1mAfzREJ1ZYsNkfGdEqVwkRJ9U=; b=eQQJ6scIaofrQiB5Gc6XFEwvwWqCX0LUv1ZgKQ4VAiYqd+P/Kq0TwcRLnmSGzv+yFJ7Exa EZXLhn62+HPfs4Wwhn4t0A4O6pvBvZeNzFeQZxZLXrvsggVtuxWOQQysfP1/gJYBecRL1v +M0pARHUl06yTdyVRuZROu4mTITByCRDp53uHWm3e3qHiXeiuUCl1CFWsbwfXc4beBF8sk xrk9WQs+QI46WxT8LJ6fqjB46J6fzLrovO1mtSPYApXtrWk5hHQ5XOp5mVLBWvCUJhwVAA 5lcjm83bw7V7k0xYO0KLiyZxDltteTBHNj/yefvaGk61ArhPv203v8rb3Usc9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750161314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kSyFZ7EiXindt81Yw1mAfzREJ1ZYsNkfGdEqVwkRJ9U=; b=BIMmUXZL0joAFrzw0U2+WWVAzgPfDoivlAWBFEPj/wmA530gw2Q3cjJKk88J80R+CwurOf 8gLMQaXmuiZzO4gdJlYBiD/jtAK8ysCW06m2h6s4usGB5TwkkQ+6HrIHUMTCeecyVJ5Voq uk8JrZ4f76FdE3kqLKTglF0DvpC+8faOKsVHudXl0hK4wyMtvT2qkOOygUS43pbDKb3fk+ zuFBWMbgsNY0TqzEmjqFpG5yc36IZ0kSUHGLt2T9OFSV6fxT+A/BKobmGghK/TPR5I68GS n/AtPGC2C4vaWYRsanoxKN/KteFD8iZyXPbsZ6peBismLpgH/IAvTN95nfhTNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750161314; a=rsa-sha256; cv=none; b=NIBMp0cyBi28wd8aOoeIN3M1LfcVMckdIQNYH+m14LNuoiFM8VEDruMHuYMkQ3DLaH97Qc rPT/UvBqkgq3mnl/uOHBNfQFlVeDJ7IoFb5Evc7wO6WZgnBKhMbS22CgceH6gr8lUn98kk tJTpOKdAqZ0XhSbInmW3nXX5CtGNoXlA5eF7eS2UUrT/MIj9aNchCP+YFV4+nZUy5McesL shFtUt65KdzhEf7Vy1XqNoD9/rdrWvH1Tw9V5SoXlXBWsVNsYLGWYzeLoEgpoxAcg1zkdB jEVLzOYLO5LbPwCqpttXv0l5bX3B4ZVIR6W5CO3n61+0ZQJnsn0lEj8+D5sIZQ== Received: by freefall.freebsd.org (Postfix, from userid 1532) id 934CB1826A; Tue, 17 Jun 2025 11:55:14 +0000 (UTC) Date: Tue, 17 Jun 2025 12:55:14 +0100 From: Lexi Winter To: Cy Schubert Cc: Ronald Klop , Cy Schubert , dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS Message-ID: Mail-Followup-To: Cy Schubert , Ronald Klop , Cy Schubert , dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org, src-committers@freebsd.org References: <240137891.21754.1749997280448@localhost> <20250616023154.3D2B730C@slippy.cwsent.com> 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 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="4IRHxbze8FHauxFp" Content-Disposition: inline In-Reply-To: <20250616023154.3D2B730C@slippy.cwsent.com> --4IRHxbze8FHauxFp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Cy Schubert: > In message <240137891.21754.1749997280448@localhost>, Ronald Klop writes: [...] > > > + if [ "$vfstype" =3D "zfs" -a "$a" !=3D "#" ]; then > > > > Does this mean that a comment # must always be folllowed by a whitespac= e? > Yes. It's a hack but it's the only way without grep (when /usr may not be= =20 > mounted). In the very worst case rc.d/zpool will be needlessly executed. could you not check for a comment using the # variable expansion operator? i.e. if [ "${a#\#}" !=3D "$a" ] then the variable starts with a # character: $ echo $line1 #Foo bar $ echo $line2 Foo bar $ echo $line3 Foo # bar $ [ "${line1#\#}" =3D "$line1" ] || echo comment comment $ [ "${line2#\#}" =3D "$line2" ] || echo comment $ [ "${line3#\#}" =3D "$line3" ] || echo comment $ --4IRHxbze8FHauxFp Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaFFXngAKCRD1nT63mIK/ YHSfAP9+GSKp8kTHklHqe1YGaYA7diJK7ZlTOnlco+Oj0Iw1ewD6A7mpT+xhYAHs HWCcmkrRKa/C3lxhVyqEGMh4+fHHHw8= =4b11 -----END PGP SIGNATURE----- --4IRHxbze8FHauxFp--