containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/machine: do not add broken localtime symlink 

The timezone might be empty so the zoneinfo link would then be invalid.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2025-04-30 18:53:07 +02:00
parent 7800db68a9
commit b431f06e64
No known key found for this signature in database
GPG Key ID: EB145DD938A3CAF2
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,10 +142,8 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
// Add or set the time zone for the machine
if len(ign.TimeZone) > 0 {
var (
err error
tz string
)
var err error
tz := ign.TimeZone
// local means the same as the host
// look up where it is pointing to on the host
if ign.TimeZone == "local" {
@ -153,25 +151,29 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
if err != nil {
return fmt.Errorf("error getting local timezone: %q", err)
}
}
// getLocalTimeZone() can return empty string, do not add broken symlink in that case
// coreos will default to UTC
if tz == "" {
logrus.Info("Unable to determine local timezone, machine will default to UTC")
} else {
tz = ign.TimeZone
tzLink := Link{
Node: Node{
Group: GetNodeGrp("root"),
Path: "/etc/localtime",
Overwrite: BoolToPtr(false),
User: GetNodeUsr("root"),
},
LinkEmbedded1: LinkEmbedded1{
Hard: BoolToPtr(false),
// We always want this value in unix form (/path/to/something) because this is being
// set in the machine OS (always Linux). However, filepath.join on windows will use a "\\"
// separator; therefore we use ToSlash to convert the path to unix style
Target: filepath.ToSlash(filepath.Join("/usr/share/zoneinfo", tz)),
},
}
ignStorage.Links = append(ignStorage.Links, tzLink)
}
tzLink := Link{
Node: Node{
Group: GetNodeGrp("root"),
Path: "/etc/localtime",
Overwrite: BoolToPtr(false),
User: GetNodeUsr("root"),
},
LinkEmbedded1: LinkEmbedded1{
Hard: BoolToPtr(false),
// We always want this value in unix form (/path/to/something) because this is being
// set in the machine OS (always Linux). However, filepath.join on windows will use a "\\"
// separator; therefore we use ToSlash to convert the path to unix style
Target: filepath.ToSlash(filepath.Join("/usr/share/zoneinfo", tz)),
},
}
ignStorage.Links = append(ignStorage.Links, tzLink)
}
// This service gets environment variables that are provided