From nobody Thu Dec 12 22:43:53 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 4Y8SF603l6z5gr4M; Thu, 12 Dec 2024 22:43:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8SF56bcTz4TJc; Thu, 12 Dec 2024 22:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734043433; 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=VfaXe4FXrCWMSYcspKr/MKWJxNZikFuHEQT1IJm8p7M=; b=He+QbCEAKgK7XUu93aSQJ+m5fmD8X/q66+H43NKmYTfxh1UxE0jxHC9CzDUOPXE2YrZUmy A1/vsfxnBT4Oa4GaVgBJTZsOHCrra1rszQlVYfvWogHJscoK6wBTothBrNrfykIKVkNYrY d2n6EcBXvy4+Q7wjNHT8Z1QnVJF6oLT9Y0bvTXs6PUN8o+uZY3+kzY8y1AeAq3yo7N93Aa J9PpQ2/j7lG0slYVehRWXLs2KKgYMulrh7ASpbZhHepwUT2ScZUB6mdKQWea0vSR/OWpDT jL0SpXL6Zrbef28INokkJ7JzTi8vrq/AE6ZAUDfa3YpA8P1rHNtU4YPgheGvqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734043433; 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=VfaXe4FXrCWMSYcspKr/MKWJxNZikFuHEQT1IJm8p7M=; b=v+poOAiDvTQ7AH5ZZtOejNklyB+yYnywzk3n+fbKHUPAvY7sh+Mn+OViwQQyUmRtSyTOrM vYg3m2mLivDtSlBmcuZ93vOoRTXrwS7AtnHEW3N5pzdV+eOxn6KDHl9SuYhAtAvsLbga1I ANVgEh0MqOQCgCF3lc6u1ESsXdMMPjG92CLmENu3csc3A39EWhrgorMFT9jOpeBTKS+Yw7 K6hoRhN+TWlra/Qbs2GnvrMIybfjmfT+c3q9wLY7JeoLO/9Uyc7Grl0ZQEOQo8IOxPHg4R 4rrkAX8KE7pqJLHzzhy3WoLkUj/5dJbn6yMrnVr781tyJb2+YQnyoXPCPCTsEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734043433; a=rsa-sha256; cv=none; b=I/wbmjbUxWjes9YgNArOAoYBFP4FKIwTjNQ2dboKNlCAhxUk6C3rLMDOv127tn/Y7ARjzx O/OJL8HiYW2/Vu+puc+VBtArbQiFjjmmtG3DmryI0D/FYO8oViLfts3egJVW4cgKPdsgu7 a4rjY07MCUBWYXjoq8V+P95ARwysiZblhMT0g4aTuepsFdqpdKF7PAP8ZhD13hk7km+ZAA bADitO5hbZq50cZImq51FnQRndmD5ZfQ4xvH4UN0l6mVP0bb/S1lMkY3mrNeFmBi9/Zyv3 CAn3V3K/1v54HR6Q+R7pPSOsaLtD0MRhsgV3Wo9A0szas+RZT7nw43CKoySEpQ== 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 4Y8SF561d7z1BVs; Thu, 12 Dec 2024 22:43:53 +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 4BCMhrlh098686; Thu, 12 Dec 2024 22:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCMhrOv098683; Thu, 12 Dec 2024 22:43:53 GMT (envelope-from git) Date: Thu, 12 Dec 2024 22:43:53 GMT Message-Id: <202412122243.4BCMhrOv098683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 3e750057fbba - stable/12 - makefs: avoid warning when creating FAT filesystem on existing file 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3e750057fbbab6bbc1075825fb79517af8f94876 Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3e750057fbbab6bbc1075825fb79517af8f94876 commit 3e750057fbbab6bbc1075825fb79517af8f94876 Author: Ed Maste AuthorDate: 2019-11-08 14:11:25 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:40:40 +0000 makefs: avoid warning when creating FAT filesystem on existing file Previously the mkfs_msdos function (from newfs_msdos) emitted warnings in the case that an image size is specified and the target is not a file, or no size is specified and the target is not a character device. The latter warning (not a character device) doesn't make sense when this code is used in makefs, regardless of whether an image size is specified or not. Sponsored by: The FreeBSD Foundation (cherry picked from commit d9aee13f6fdad3de080ac0f8b9847daf6b9d567b) --- sbin/newfs_msdos/mkfs_msdos.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 96080849ca9c..2369a5089fcf 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -291,8 +291,10 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) if (!S_ISREG(sb.st_mode)) warnx("warning, %s is not a regular file", fname); } else { +#ifndef MAKEFS if (!S_ISCHR(sb.st_mode)) warnx("warning, %s is not a character device", fname); +#endif } if (!o.no_create) if (check_mounted(fname, sb.st_mode) == -1)