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 DBBD1535BA for ; Fri, 8 Mar 2024 09:49:52 +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=1709891394; cv=none; b=PHesIm2puw3FYBXwUpHq2qNZXcCEVoLMgWqKsSQgkTf/l7crVvwYK/GY+XevdZIEymkxlYzNOG+mtUCGycUr3FMc4USt16TlkmoC2oEZMAAeo1hP6Ij/fgOK8qJxWqXt59ZrJRUkDkKz/OosfM6ApN+ZF6yI9OFLTf8cOgZNWCg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709891394; c=relaxed/simple; bh=Z9VHz1Cmxc/yWSJFVRH5nPvjSWTnR7cU2QiHOAbn35M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W/kcoM3LnWdLMWWD5kmOwB0HW6Pkecd12Fb7mDuVZfaJu/tWb/5KAnK2PAlJ8Z4YaxEWoXa1iHS3jOAR/6TRZeIMXxldtUBIJIM7jjucGBym8iUWIxZMUtMy9JCz6G5OhQucN+fPkAgnthVoZfzf252PBr9GO84Y+VKPo9k+3ws= 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=mcQ+xIbo; 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="mcQ+xIbo" 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=VlTNpQLK2RcnexLV0bKDTtJsxVIwu+Hdn7PRRhwO4IA=; b=mcQ+xIbo063du9sx6EBr6SuQ7W JXlWIjByP0fhOczH63xnIeHPjAfLGWUIFn1+EtiWrLDDUtQ/2hh3oluUo6Hxr4h99RxuIMM8H1aD6 yIAHI0OhiFb5y1d4pyxTjMUymKtJTxzgh6RGYfYQXVsL07V5JvvFHyy3pGHIp1i9ZQfWAbNhxm5DA JVGgEns5TJTALXCvMD/A6gj4gpYftPpnV4Y9Tmpo6M+x5AQkpoByEd4jmTBuoo4TGsgPkgVFlS27o Hgb8un3qx92PX7vEFExKU4AvnmF4v3l2rcITJ09Vx4nmQB3mfdIPqmxhvo9G4PYGStGdFIjSGNkyt c6S1SmBQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1riWrP-00000008dHa-3MiX; Fri, 08 Mar 2024 09:49:51 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: dave@stgolabs.net, a.manzanares@samsung.com, fan.ni@samsung.com, jim.harris@samsung.com, Luis Chamberlain Subject: [PATCH 1/2] systemd-remote-journal: fix bridge ip for guestsfs Date: Fri, 8 Mar 2024 01:49:49 -0800 Message-ID: <20240308094951.2057614-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308094951.2057614-1-mcgrof@kernel.org> References: <20240308094951.2057614-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 The IP address for the default network must be used for the systemd-remote-journal. This can vary distro-to-distro and so provide an easy way to describe this. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.ansible_provisioning | 3 ++- kconfigs/Kconfig.guestfs | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kconfigs/Kconfig.ansible_provisioning b/kconfigs/Kconfig.ansible_provisioning index 2775ddff22ae..0cddf220d2f7 100644 --- a/kconfigs/Kconfig.ansible_provisioning +++ b/kconfigs/Kconfig.ansible_provisioning @@ -195,7 +195,8 @@ config DEVCONFIG_SYSTEMD_JOURNAL_USE_HTTP config DEVCONFIG_SYSTEMD_JOURNAL_REMOTE_URL string "systemd-remote URL" - default "http://192.168.124.1" + default "http://192.168.124.1" if VAGRANT + default GUESTFS_DEFAULT_BRIDGE_IP if GUESTFS help This is used for the client /etc/systemd/journal-upload.conf URL line. By default we won't use SSL for now. If you should make sure the diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index 03e0fb865a66..377f3434a892 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -1,5 +1,11 @@ if GUESTFS +config GUESTFS_DEFAULT_BRIDGE_IP + string + default "http://192.168.122.1" if DISTRO_FEDORA || DISTRO_REDHAT + default "http://192.168.122.1" if DISTRO_OPENSUSE || DISTRO_SUSE + default "http://192.168.122.1" if DISTRO_DEBIAN || DISTRO_UBUNTU + choice prompt "Guestfs Linux distribution to use" default GUESTFS_FEDORA if DISTRO_FEDORA || DISTRO_REDHAT -- 2.43.0