opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-17 03:04:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "podman machine: fix proxy test"

Browse Source 
This reverts commit 0b8dd9084010b1d444d7362c5be6704843c21aba.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-06-06 17:50:24 +02:00
parent adc35b157e
commit 0c77654be7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/machine/ignition/ignition.go
View File

@ -480,7 +480,7 @@ func prepareCertFile(fpath string, name string) (File, error) {
const ( const (
systemdSSLConf = "/etc/systemd/system.conf.d/podman-machine-ssl.conf" 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" profileSSLConf = "/etc/profile.d/podman-machine-ssl.sh"
sslCertFile = "SSL_CERT_FILE" sslCertFile = "SSL_CERT_FILE"
sslCertDir = "SSL_CERT_DIR" sslCertDir = "SSL_CERT_DIR"
@ -488,7 +488,7 @@ const (
func getSSLEnvironmentFiles(sslFileName, sslDirName string) []File { func getSSLEnvironmentFiles(sslFileName, sslDirName string) []File {
systemdFileContent := "[Manager]\n" systemdFileContent := "[Manager]\n"
// envdFileContent := "" envdFileContent := ""
profileFileContent := "" profileFileContent := ""
if sslFileName != "" { if sslFileName != "" {
// certs are written to UserCertsTargetPath see prepareCertFile() // 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. // 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))) env := fmt.Sprintf("%s=%q\n", sslCertFile, path.Join(define.UserCertsTargetPath, filepath.Base(sslFileName)))
systemdFileContent += "DefaultEnvironment=" + env systemdFileContent += "DefaultEnvironment=" + env
// envdFileContent += env envdFileContent += env
profileFileContent += "export " + env profileFileContent += "export " + env
} }
if sslDirName != "" { if sslDirName != "" {
// certs are written to UserCertsTargetPath see prepareCertFile() // certs are written to UserCertsTargetPath see prepareCertFile()
env := fmt.Sprintf("%s=%q\n", sslCertDir, define.UserCertsTargetPath) env := fmt.Sprintf("%s=%q\n", sslCertDir, define.UserCertsTargetPath)
systemdFileContent += "DefaultEnvironment=" + env systemdFileContent += "DefaultEnvironment=" + env
// envdFileContent += env envdFileContent += env
profileFileContent += "export " + env profileFileContent += "export " + env
} }
return []File{ return []File{
getSSLFile(systemdSSLConf, systemdFileContent), getSSLFile(systemdSSLConf, systemdFileContent),
// FIXME: something is very broken with the environment.d systemd generator. getSSLFile(envdSSLConf, envdFileContent),
// When setting any var there the systemd fails to boot successfully.
// getSSLFile(envdSSLConf, envdFileContent),
getSSLFile(profileSSLConf, profileFileContent), getSSLFile(profileSSLConf, profileFileContent),
} }
} }