wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/initContainer: Handle hosts with /etc/localtime as absolute symlink

Browse source 
On Arch Linux and Ubuntu hosts, /etc/localtime is an absolute symbolic
link to /usr/share/zoneinfo/SomeTimeZone. So, inside the container,
/run/host/etc/localtime also has /usr/share/zoneinfo/SomeTimeZone as
its target.

https://github.com/containers/toolbox/issues/622
This commit is contained in:
Kan Li 2020-11-27 15:15:51 -08:00 committed by Debarshi Ray
parent 772451c5e5
commit 69dd701d3a
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/cmd/initContainer.go
View file

@ -586,6 +586,28 @@ func sanitizeRedirectionTarget(target string) string {
return target
}
func extractTimeZoneFromLocalTimeSymLink(path string) (string, error) {
zoneInfoRoots := []string{
"/run/host/usr/share/zoneinfo",
"/usr/share/zoneinfo",
}
for _, root := range zoneInfoRoots {
if !strings.HasPrefix(path, root) {
continue
}
timeZone, err := filepath.Rel(root, path)
if err != nil {
return "", fmt.Errorf("failed to extract time zone: %w", err)
}
return timeZone, nil
}
return "", errors.New("/etc/localtime points to unknown location")
}
func updateTimeZoneFromLocalTime() error {
localTimeEvaled, err := filepath.EvalSymlinks("/etc/localtime")
if err != nil {
@ -602,15 +624,9 @@ func updateTimeZoneFromLocalTime() error {
logrus.Debugf("Resolved /etc/localtime to %s", localTimeEvaled)
const zoneInfoRoot = "/run/host/usr/share/zoneinfo"
if !strings.HasPrefix(localTimeEvaled, zoneInfoRoot) {
return errors.New("/etc/localtime points to unknown location")
}
timeZone, err := filepath.Rel(zoneInfoRoot, localTimeEvaled)
timeZone, err := extractTimeZoneFromLocalTimeSymLink(localTimeEvaled)
if err != nil {
return fmt.Errorf("failed to extract time zone: %w", err)
return err
}
if err := writeTimeZone(timeZone); err != nil {