Skip to content

Commit 652d192

Browse files
committed
guestfs: generate fedora short prefixes
Signed-off-by: Daniel Gomez <[email protected]>
1 parent 656d712 commit 652d192

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

kconfigs/Kconfig.guestfs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ choice
7878
config GUESTFS_FEDORA
7979
bool "Fedora (or derived distro)"
8080
output yaml
81+
select HAVE_CUSTOM_DISTRO_HOST_PREFIX
82+
select HAVE_DISTRO_PREFERS_CUSTOM_HOST_PREFIX
8183
select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS
8284
select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS
8385
select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4
@@ -222,6 +224,13 @@ config GUESTFS_DEBIAN_COPY_HOST_SOURCES
222224

223225
endif # GUESTFS_DEBIAN
224226

227+
config GUESTFS_FEDORA_BOX_SHORT
228+
string
229+
default "fedora41" if VIRT_BUILDER_OS_VERSION = "fedora-41"
230+
default "fedora40" if VIRT_BUILDER_OS_VERSION = "fedora-40"
231+
default "fedora39" if VIRT_BUILDER_OS_VERSION = "fedora-39"
232+
default "fedora"
233+
225234
config VIRT_BUILDER_OS_VERSION
226235
string "virt-builder os-version"
227236
default "fedora-39" if GUESTFS_FEDORA

kconfigs/Kconfig.kdevops

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ config HAVE_DISTRO_REQUIRES_CUSTOM_SSH_KEXALGORITHMS
2525
config CUSTOM_DISTRO_HOST_PREFIX
2626
string
2727
depends on HAVE_CUSTOM_DISTRO_HOST_PREFIX
28+
default GUESTFS_FEDORA_BOX_SHORT if GUESTFS_FEDORA
2829
default GUESTFS_DEBIAN_BOX_SHORT if GUESTFS_DEBIAN
2930

3031
config CUSTOM_SSH_KEXALGORITHMS

0 commit comments

Comments
 (0)