From 0c77654be78f7f92f70205bf380fc8690957e1a0 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 6 Jun 2025 17:50:24 +0200 Subject: [PATCH] Revert "podman machine: fix proxy test" This reverts commit 0b8dd9084010b1d444d7362c5be6704843c21aba. Signed-off-by: Paul Holzinger --- pkg/machine/ignition/ignition.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go index bfc2ceba72..e9ae184d2a 100644 --- a/pkg/machine/ignition/ignition.go +++ b/pkg/machine/ignition/ignition.go @@ -480,7 +480,7 @@ func prepareCertFile(fpath string, name string) (File, error) { const ( systemdSSLConf = "/etc/systemd/system.conf.d/podman-machine-ssl.conf" - // envdSSLConf = "/etc/environment.d/podman-machine-ssl.conf" + envdSSLConf = "/etc/environment.d/podman-machine-ssl.conf" profileSSLConf = "/etc/profile.d/podman-machine-ssl.sh" sslCertFile = "SSL_CERT_FILE" sslCertDir = "SSL_CERT_DIR" @@ -488,7 +488,7 @@ const ( func getSSLEnvironmentFiles(sslFileName, sslDirName string) []File { systemdFileContent := "[Manager]\n" - // envdFileContent := "" + envdFileContent := "" profileFileContent := "" if sslFileName != "" { // certs are written to UserCertsTargetPath see prepareCertFile() @@ -496,21 +496,19 @@ func getSSLEnvironmentFiles(sslFileName, sslDirName string) []File { // a path on the client (i.e. windows) but then join to linux path that will be used inside the VM. env := fmt.Sprintf("%s=%q\n", sslCertFile, path.Join(define.UserCertsTargetPath, filepath.Base(sslFileName))) systemdFileContent += "DefaultEnvironment=" + env - // envdFileContent += env + envdFileContent += env profileFileContent += "export " + env } if sslDirName != "" { // certs are written to UserCertsTargetPath see prepareCertFile() env := fmt.Sprintf("%s=%q\n", sslCertDir, define.UserCertsTargetPath) systemdFileContent += "DefaultEnvironment=" + env - // envdFileContent += env + envdFileContent += env profileFileContent += "export " + env } return []File{ getSSLFile(systemdSSLConf, systemdFileContent), - // FIXME: something is very broken with the environment.d systemd generator. - // When setting any var there the systemd fails to boot successfully. - // getSSLFile(envdSSLConf, envdFileContent), + getSSLFile(envdSSLConf, envdFileContent), getSSLFile(profileSSLConf, profileFileContent), } }