From nobody Tue Oct 08 07:07:44 2024 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 4XN6Xx1kmFz5Z4yM; Tue, 08 Oct 2024 07:07:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN6Xx0bQ5z42mC; Tue, 8 Oct 2024 07:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371265; 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=3Iz4hhxCcqD+P5F8IWPxmu8gz66E2LsuADvReZNKpDo=; b=XNmPdzZiY7pnJ0XTdVxPISCM0vD8vRSQahYHbVZotawmMdEY1p1n7yPWv84DrfqZbl4qXp h0pli6wP0t+qgtpVefnzCWgJB/NnbyrEdHqPNvHef6DOTu45y9rbjx34m+arlVsJcyeuFq RGw4NNnxmH86JfOC61YwBTMUFkKs9XO1GGH+V8HRwWbZ/zdyk+oQCYNXjlgxulXLt4wuPF AJLz7b0w69ztY7hngHWoBI5wrnm0O0RA1/G4hZbHAgd1Ti6zcO5c6SnSKZyIzXjevHaKjy Xi6ex3S6Q4T2cGOYEbWsa0WLHza+LSXmN802+8K2qm70lWhNYNFFOPRtFMV1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371265; 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=3Iz4hhxCcqD+P5F8IWPxmu8gz66E2LsuADvReZNKpDo=; b=phzV+yzOD8/6fKAMlDl7zQ+tpAepzR7v72r2dYAvt5TY+vQhNFg5hiRBHGIiPnMeA024aa p22aNdmVVXyHjq+bMJC1S8ZxtpPAXf042PZjqsU2asDTXboozlDiYGqoK0rEUqBXlu6tjQ B/xUh53Vi94UVh3fUl8uUm5f1hNpzo3QdSmyQt9QhIcEfuV1jT7WCWDgW8T8lg7iAlq30u XnVCaY5+HnP883woetrE4AJsWSpB+V15JylnG9hjlVMVzK22H9SFGdNxRmNZ71YByKtbY+ eExsLIeuWx7IibUBpM9AAXq0bTk5GPVGJf7hUurje8ZLhpcoVlN0Sf2Eo2j8PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728371265; a=rsa-sha256; cv=none; b=rqTYZ56DeCly3h9vBXn/acMFu4rK3+yVxPnKIWo/2TdEXdB+fsaoZriyOAJtsd8R0StUmP IlM7huP9pHXR6NB7kXOs5F3jBeh4Es2P1j84DTj0jmGB6wcIXi/koqNfRkCHLmnTK1lmKC QZPxCjLMoZTZfA4GARjMLaE8vJVmDYicd4knEBrDaa6rEWRcUaCN1tvcrm7Lwn6MpzMTkj 8FFtKBHbv/3KoTZWu+4ARAcDdmrTE/9O6IXahR8MNLRhUAwIdcjYlUjZGYNMPxvRhlULQ/ un2stOSaffunb251cnjwxlvSPAyKUMb19yMhE5VEGIfwb3SwThkHMtpedxSrlQ== 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 4XN6Xx0BD2zLGL; Tue, 8 Oct 2024 07:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49877ihD051438; Tue, 8 Oct 2024 07:07:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49877ire051435; Tue, 8 Oct 2024 07:07:44 GMT (envelope-from git) Date: Tue, 8 Oct 2024 07:07:44 GMT Message-Id: <202410080707.49877ire051435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c96dbfbd1b52 - stable/14 - nuageinit: Silence an fstyp(8) warning 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c96dbfbd1b5274cd0cdcdffacfe365f7be1d2d79 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c96dbfbd1b5274cd0cdcdffacfe365f7be1d2d79 commit c96dbfbd1b5274cd0cdcdffacfe365f7be1d2d79 Author: Jose Luis Duran AuthorDate: 2024-07-26 01:59:36 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-08 07:04:01 +0000 nuageinit: Silence an fstyp(8) warning Silence a warning emitted by fread(3) in fstyp(8)'s read_buf(), when detecting the file system type of the cloud-init device: % fstyp /dev/iso9660/cidata fstyp: fread: Invalid argument cd9660 Also rephrase slightly a comment while here. Signed-off-by: Jose Luis Duran (cherry picked from commit d71e2c037c942dbe2a9fd2630d5cf155dd1bf7db) --- libexec/rc/rc.d/nuageinit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index 8da0b1aed741..a44761ea1d9e 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -18,8 +18,8 @@ nuageinit_start() { local citype # detect cloud init provider - # according to the specification of the config drive - # it either formatted in vfat or iso9660 and labeled + # according to the specification, the config drive + # is either formatted in vfat or iso9660 and labeled # config-2 for f in iso9660 msdosfs; do drive="/dev/$f/[cC][oO][nN][fF][iI][gG]-2" @@ -39,7 +39,7 @@ nuageinit_start() err 1 "Impossible to find a cloud init provider" fi mkdir -p /media/nuageinit - fs=$(fstyp $drive) + fs=$(fstyp $drive 2> /dev/null) mount -t $fs $drive /media/nuageinit # according to the specification, the content is either # in the openstack or ec2 directory