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 90663DDDF for ; Tue, 5 Mar 2024 00:56:46 +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=1709600207; cv=none; b=sDVjQUGkepEBgtl5MWdzePaXzQrGRxq9A1NuFAw8449vN38h91OFeBDmRFF8KBneClnsQS7WwiKvHiNouY7BrGxIpcQEcgWgsmMTurxKxMES46kP47SJEH64ogOPfAld6BD89PfS83lLRjciBSuPHv50AM8bzfkqzPiMsoxQXVU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709600207; c=relaxed/simple; bh=OylAK7YgR9Np3LRoA/E4SyG7sY9N3y7KEoGbVXVuPAU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pyxfSii4WX2nU/chFgk9yw6+yjKVd8Om8jshzkYVIH5cN09K8BKm+apZD+Qw5s1dBGJTcZQX55Q6aWdQxVQZfi+iDWfOthZL/Mkg/l9pZzWNrvnK8wPFCV+ub1U0w9p8VPKBVOMXmdCr9L4RvCcPB2joT8JsyjY0JwSeEsy2fWk= 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=1C3AY7oB; 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="1C3AY7oB" 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=ks1pJybwfh1K0KfRsUVX9Sy3tYi7Vax4J9oIqq8cOkw=; b=1C3AY7oBTzhgbSwFoRmeSPnhsz ro2wGxkdG+PhkdeBdnqi8Vi/c9yat5JkW+hwIWR2g1i7ORwacY+yiS9Ta3NixZd/4oUvrvoX3pa+B sklShInMkx7/4G/rgStLpOSeKAj1iBli1PQgXAx3AUss72ac0EEgurIsCQaKO2XgZRDB5Gjk3E0b/ eBGbOzOUm6JsOhSv7ex7HrswEAY0GiLikJ7KYkOsRDzzSD5BANkFVFjZUVB0lYRL4pCO+IHoOzjRX xk9Nye/hTWnwecbRgXbmSZ2EMv7JfLwN/JnyckoYyDKC4h9eNWtwi8/Ht5Zd8lx5S7VZtAkh1nN7c GdbIs1Cw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rhJ6s-0000000BJdm-1Att; Tue, 05 Mar 2024 00:56:46 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 3/3] guestfs: add debian guest support Date: Mon, 4 Mar 2024 16:56:44 -0800 Message-ID: <20240305005645.2697081-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240305005645.2697081-1-mcgrof@kernel.org> References: <20240305005645.2697081-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 guestfs has only debian-12, no debian testing yet. While at it, also set default fedora options for fstests when the user tests a specific filesystem. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.bringup | 42 +++++++++++++++++++++++++++++++++++++++- kconfigs/Kconfig.kdevops | 1 + 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup index 95991cc599f4..ba7b5430bcf9 100644 --- a/kconfigs/Kconfig.bringup +++ b/kconfigs/Kconfig.bringup @@ -58,14 +58,54 @@ config SKIP_BRINGUP endchoice if GUESTFS + +choice + prompt "Guestfs Linux distribution to use" + default GUESTFS_FEDORA + +config GUESTFS_FEDORA + bool "Fedora (or derived distro)" + select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS + select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS + select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4 + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + help + This option will set the target guest to be a distro in the Fedora family. + For example, Fedora, RHEL, etc. + +config GUESTFS_DEBIAN + bool "Debian" + select HAVE_CUSTOM_DISTRO_HOST_PREFIX + select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS + select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS + select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4 + select HAVE_DISTRO_PREFERS_CUSTOM_HOST_PREFIX + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + help + This option will set the target guest to Debian. + +endchoice + config VIRT_BUILDER_OS_VERSION string "virt-builder os-version" - default "fedora-39" + default "fedora-39" if GUESTFS_FEDORA + default "debian-12" if GUESTFS_DEBIAN help Have virt-builder use this os-version string to build a root image for the guest. Run "virt-builder -l" 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 config LIBVIRT diff --git a/kconfigs/Kconfig.kdevops b/kconfigs/Kconfig.kdevops index 53782f413a44..423619cf1443 100644 --- a/kconfigs/Kconfig.kdevops +++ b/kconfigs/Kconfig.kdevops @@ -28,6 +28,7 @@ config CUSTOM_DISTRO_HOST_PREFIX default VAGRANT_DEBIAN_BOX_SHORT if VAGRANT_DEBIAN default VAGRANT_OPENSUSE_BOX_SHORT if VAGRANT_OPENSUSE default VAGRANT_REDHAT_GENERIC_BOX_SHORT if VAGRANT_REDHAT_GENERIC + default GUESTFS_DEBIAN_BOX_SHORT if GUESTFS_DEBIAN config CUSTOM_SSH_KEXALGORITHMS string -- 2.43.0