X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fappliance.c;h=906b6a9b556c4ed4775849601f9db45e8f60c8c0;hb=b61fddabaf4cdf171731a0a2ea63d727844d0958;hp=6d560ec438aa2e0d74685f597bd882e68dac250a;hpb=3d114fcf84372c52ea769c4bb8efa572936f1f5a;p=libguestfs.git diff --git a/src/appliance.c b/src/appliance.c index 6d560ec..906b6a9 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -320,7 +320,6 @@ check_for_cached_appliance (guestfs_h *g, snprintf (filename, len, "%s/checksum", cachedir); (void) mkdir (cachedir, 0755); - (void) utime (cachedir, NULL); /* See if the cache directory exists and passes some simple checks * to make sure it has not been tampered with. @@ -344,13 +343,19 @@ check_for_cached_appliance (guestfs_h *g, return -1; } + (void) utime (cachedir, NULL); + garbage_collect_appliances (cachedir); /* Try to open and acquire a lock on the checksum file. */ int fd = open (filename, O_RDONLY); if (fd == -1) return 0; +#ifdef HAVE_FUTIMENS (void) futimens (fd, NULL); +#else + (void) futimes (fd, NULL); +#endif struct flock fl; fl.l_type = F_RDLCK; fl.l_whence = SEEK_SET; @@ -563,18 +568,23 @@ hard_link_to_cached_appliance (guestfs_h *g, perrorf (g, "link: %s %s", filename, *kernel); goto error; } + (void) lutimes (filename, NULL); /* lutimes because it's a symlink */ + snprintf (filename, len, "%s/initrd", cachedir); (void) unlink (*initrd); if (link (filename, *initrd) == -1) { perrorf (g, "link: %s %s", filename, *initrd); goto error; } + (void) utime (filename, NULL); + snprintf (filename, len, "%s/root", cachedir); (void) unlink (*appliance); if (link (filename, *appliance) == -1) { perrorf (g, "link: %s %s", filename, *appliance); goto error; } + (void) utime (filename, NULL); return 0;