public inbox for kdevops@lists.linux.dev
 help / color / mirror / Atom feed
From: Luis Chamberlain <mcgrof@kernel.org>
To: Chuck Lever <cel@kernel.org>, Daniel Gomez <da.gomez@kruces.com>,
	kdevops@lists.linux.dev
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 1/8] guestfs: Fix Debian 13 (Trixie) APT sources file path
Date: Fri, 17 Oct 2025 19:31:46 -0700	[thread overview]
Message-ID: <20251018023154.2239688-2-mcgrof@kernel.org> (raw)
In-Reply-To: <20251018023154.2239688-1-mcgrof@kernel.org>

Debian 13 (Trixie) changed from using a single /etc/apt/sources.list
file to the new DEB822 format in /etc/apt/sources.list.d/debian.sources.

This was causing virt-customize to fail during base image creation with:
  virt-customize: error: libguestfs error: source '/etc/apt/sources.list'
  does not exist (or cannot be read)

Add a conditional default for GUESTFS_DISTRO_SOURCE_AND_DEST_FILE that
uses the new path for Debian Trixie while preserving the old path for
other Debian versions.

Generated-by: Claude AI
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 kconfigs/Kconfig.guestfs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs
index 52506a3b..01f68eec 100644
--- a/kconfigs/Kconfig.guestfs
+++ b/kconfigs/Kconfig.guestfs
@@ -64,6 +64,7 @@ config GUESTFS_DISTRO_SOURCE_AND_DEST_FILE
 	string
 	depends on GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST
 	output yaml
+	default "/etc/apt/sources.list.d/debian.sources" if GUESTFS_DEBIAN_TRIXIE
 	default "/etc/apt/sources.list" if GUESTFS_DEBIAN
 
 endif
-- 
2.51.0


  reply	other threads:[~2025-10-18  2:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-18  2:31 [PATCH 0/8] guestfs / base_images: fixes Luis Chamberlain
2025-10-18  2:31 ` Luis Chamberlain [this message]
2025-10-18  2:31 ` [PATCH 2/8] guestfs: Don't delete APT sources copied from host Luis Chamberlain
2025-10-18  2:31 ` [PATCH 3/8] guestfs: Fix dracut-config-rescue removal for Debian systems Luis Chamberlain
2025-10-18 18:16   ` Chuck Lever
2025-10-21 16:56     ` Luis Chamberlain
2025-10-18  2:31 ` [PATCH 4/8] base_image: put a guard check before adding kdevops user Luis Chamberlain
2025-10-18  2:31 ` [PATCH 5/8] base_image: relax base image permissions Luis Chamberlain
2025-10-18  2:31 ` [PATCH 6/8] guestfs: Use sudo for base image copy with system libvirt Luis Chamberlain
2025-10-18  2:31 ` [PATCH 7/8] guestfs: Fix base_image_pathname for custom images Luis Chamberlain
2025-10-18  2:31 ` [PATCH 8/8] playbooks: Fix host pattern for single-node setups Luis Chamberlain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251018023154.2239688-2-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=cel@kernel.org \
    --cc=da.gomez@kruces.com \
    --cc=kdevops@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox