From nobody Thu Sep 26 11:06:16 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 4XDrPh2dftz5X7w9; Thu, 26 Sep 2024 11:06:16 +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 4XDrPh1VJVz4HH4; Thu, 26 Sep 2024 11:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727348776; 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=6cM+gWUzXXjV/QYQ1CCRYCUDhPXmZOxL6JjS5ZcV89k=; b=syOZKEUOXpwHk9UAGe1XJZIkFBmBx5UIVI5IOL1+6Gijor5WXXowym2RYpj6zGza36qLXR 4BlQyIAKFSDChKiU/V/ZGT65zzgRSPLuUWgv6RGbU4pYTw+qbFyZCVuER4e+pdy0jvXmcj q2wXJ1bynrktNsCyZbaIZOxFkht6ef8xMmpEJWM4Z890+CcBfCeLzNjHPrxI5ZvkdYMryb yFbaSYSeVS1423mSDu6FQCemu/2qsJpPGprxFF1j1cRObqf5BgfLKtN+Q88KIoRxQghaI0 xnJYog4Ju+DJy3lrMQdwfXpJXrzyUtBtC54GiS0n0u19siJXimg1rXVvO372NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727348776; 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=6cM+gWUzXXjV/QYQ1CCRYCUDhPXmZOxL6JjS5ZcV89k=; b=hPBqe5TuQZDHAFPKX7fSVqkactsajN+oOzEzRNXPp0XBFG7Lqy8Fr/4iTXG2rhvZ1t5nu+ 0XwijvSS230yIvsJgpF1Xso5sqwfEKnGRSh6IRvFbiBVMomgASZsCIb0myludgCduw5VV1 QXwBKu3VP/1DB93Xn3kZHry+xLIHZE3P50VTNS6ZuboMW6Xbmi9x6dRO54zWUDcOEArLSI JONGPK2U9sGuCGSqmKv0eRzRe/n4LzUvirIvxeh88NlrGWIIvP+p86J7vERNTMU6CHNyB9 P3h7aY28GDTyzdTw73bqsKPW5ePTItpNS3xwrK5On6qmiPUdnJ43UeFzFFqXYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727348776; a=rsa-sha256; cv=none; b=IHx1FPGHCEzbjM1hfAT/FKdk4AmEdcriggb4vf+je/t1lOmz0Sv09RX7sbG3Z8F0YJ5nRR IVTrZm8astU3TcONZg033XBqjf0QoUQY2G35mFKlu4EP+vHQzGzvkgSDOPe0uEwgUl0Gb3 Glgrg7yYPMA4vfs/sM+2VxmZ73C3uNutY4BF7PXr0tvwDN1nyJJXlD9w1nDZR6JQSwSJct cyvqS6MqzMvDxplwdoLrU1DgvLO0Xnl1OOchz/UtPKuhj3JpSx1LlD0SSQ1zjhQku5hx4J rLlkBSctmNfPuLnsK0FeuzxtlW7mxJ8MRfdRU5PdTSKQLrCL6piHa/KW2Olpng== 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 4XDrPh16PKztTZ; Thu, 26 Sep 2024 11:06:16 +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 48QB6G99063420; Thu, 26 Sep 2024 11:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48QB6G4M063417; Thu, 26 Sep 2024 11:06:16 GMT (envelope-from git) Date: Thu, 26 Sep 2024 11:06:16 GMT Message-Id: <202409261106.48QB6G4M063417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: d71e2c037c94 - main - nuageinit: Silence an fstyp(8) warning 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d71e2c037c942dbe2a9fd2630d5cf155dd1bf7db Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d71e2c037c942dbe2a9fd2630d5cf155dd1bf7db commit d71e2c037c942dbe2a9fd2630d5cf155dd1bf7db Author: Jose Luis Duran AuthorDate: 2024-07-26 01:59:36 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-26 10:58:42 +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 --- 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