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

Merge pull request #2023 from alexlarsson/old_kernel 

Image: Fix time setting for old kernels
This commit is contained in:
Victor Vieux 2013-09-27 05:25:13 -07:00
parent ebfa24acb0 75e958bf48
commit 514886c73d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
image.go
View File

@ -151,6 +151,7 @@ func (image *Image) TarLayer(compression Compression) (Archive, error) {
type TimeUpdate struct { type TimeUpdate struct {
path string path string
time []syscall.Timeval time []syscall.Timeval
mode uint32
} }
func (image *Image) applyLayer(layer, target string) error { func (image *Image) applyLayer(layer, target string) error {
@ -291,6 +292,7 @@ func (image *Image) applyLayer(layer, target string) error {
u := TimeUpdate{ u := TimeUpdate{
path: targetPath, path: targetPath,
time: ts, time: ts,
mode: srcStat.Mode,
} }
// Delay time updates until all other changes done, or it is // Delay time updates until all other changes done, or it is
@ -308,21 +310,24 @@ func (image *Image) applyLayer(layer, target string) error {
update := updateTimes[i] update := updateTimes[i]
O_PATH := 010000000 // Not in syscall yet O_PATH := 010000000 // Not in syscall yet
fd, err := syscall.Open(update.path, syscall.O_RDWR|O_PATH|syscall.O_NOFOLLOW, 0600) var err error = nil
if err == syscall.EISDIR || err == syscall.ELOOP { if update.mode&syscall.S_IFLNK == syscall.S_IFLNK {
// O_PATH not supported, use Utimes except on symlinks where Utimes doesn't work // Update time on the symlink via O_PATH + futimes(), if supported by the kernel
if err != syscall.ELOOP {
err = syscall.Utimes(update.path, update.time) fd, err := syscall.Open(update.path, syscall.O_RDWR|O_PATH|syscall.O_NOFOLLOW, 0600)
if err != nil { if err == syscall.EISDIR || err == syscall.ELOOP {
return err // O_PATH not supported by kernel, nothing to do, ignore
} } else if err != nil {
return err
} else {
syscall.Futimes(fd, update.time)
_ = syscall.Close(fd)
} }
} else { } else {
err = syscall.Utimes(update.path, update.time)
if err != nil { if err != nil {
return err return err
} }
syscall.Futimes(fd, update.time)
_ = syscall.Close(fd)
} }
} }