From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 625FF17C72 for ; Wed, 8 May 2024 06:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715151041; cv=none; b=q6U3+Etc5o0Z8uAFwynfn1BIyBx8OD86iryHRavKw+2T4l+zZtfYsdvKTLbZSMmZrxOZQ7geUQIzLf9avsNyEurVR/Y2D6WDzSAC0gOBal6jTZIAlnVk+0NqWdA0FnS3vhIC7PY8WbfZQA8yLSyMXXemE/i2wLiLTwaBRd/3d2k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715151041; c=relaxed/simple; bh=NH4zgOntZ197XNvUF5/CaLQMt48isggI2HT3MbXP1bo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DHuN49nP8eeVJ5I9eFSK6pzgVKm9dpXihgSUCMcdICaIasehCtUga3Sc3TNWzFylBgCmwdK7ukfhukTPIUIgUlQM5X5E7CCl7ePRm58gLEAgPZqOtM6+x029EGlji+l3wHy24WrxSHAy4oUc2kBcTGE3MoZ6PDIiGBAeSNKQUwg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=ysNafxJN; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ysNafxJN" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=WnjUUybAKuWy2evEZkn3KFyoibipoMx7bipzgAAR3P4=; b=ysNafxJNBurPDtbuwCIXarDVPO QOAbmlNIZkvhHCezuMy07J6YOHi6bKhJqpCx7WS47AMPChPfWV0YPxb7Fb+Aluzb0dVX7B7f4xjpV wSFo9BHXjHNJVRrb3zQwJOoBC/R7hPwkEkaF30tEnVV3vci/mZBPgvg8Sy6XYmItdEnlXlQREbtgX 92sLPPrxZhnxu0iMxsekJNLHnZfY27KDranjFd7NeGqKBKeM7rJYg4nIhw/9xA2bNCuDYSBLOilWG mh7eCFL314dVxzfngmuIS/ydG3CZ/q0PZmy7BLHR2hTAZxxOQWzysp+2OB4hvZhEu9HA1170eLvu2 XVXh0juQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4b8S-0000000EIkA-05Xo; Wed, 08 May 2024 06:50:40 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: mcgrof@kernel.org Subject: [PATCH 01/10] guestfs: move debian options before image names Date: Tue, 7 May 2024 23:50:29 -0700 Message-ID: <20240508065039.3408637-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240508065039.3408637-1-mcgrof@kernel.org> References: <20240508065039.3408637-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Move debian specific options before we define the image filename to look for, as if we add the option to support other releases other than buster then the filename will change. This introduces no functional changes. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.guestfs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index 03e0fb865a66..5838522908e8 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -31,6 +31,14 @@ config GUESTFS_DEBIAN endchoice +if GUESTFS_DEBIAN + +config GUESTFS_DEBIAN_BOX_SHORT + string + default "debian12" if GUESTFS_DEBIAN + +endif # GUESTFS_DEBIAN + config VIRT_BUILDER_OS_VERSION string "virt-builder os-version" default "fedora-39" if GUESTFS_FEDORA @@ -41,12 +49,4 @@ config VIRT_BUILDER_OS_VERSION to get a list of operating systems and versions supported by guestfs. -if GUESTFS_DEBIAN - -config GUESTFS_DEBIAN_BOX_SHORT - string - default "debian12" if GUESTFS_DEBIAN - -endif - endif # GUESTFS -- 2.43.0