git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perl: Ignore internal_* functions in POD coverage test.
[libguestfs.git]
/
src
/
appliance.c
diff --git
a/src/appliance.c
b/src/appliance.c
index
30eb6fd
..
ef724be
100644
(file)
--- a/
src/appliance.c
+++ b/
src/appliance.c
@@
-308,7
+308,7
@@
check_for_cached_appliance (guestfs_h *g,
uid_t uid,
char **kernel, char **initrd, char **appliance)
{
uid_t uid,
char **kernel, char **initrd, char **appliance)
{
- const char *tmpdir = guestfs_tmpdir ();
+ const char *tmpdir = guestfs_
__persistent_
tmpdir ();
/* len must be longer than the length of any pathname we can
* generate in this function.
/* len must be longer than the length of any pathname we can
* generate in this function.
@@
-320,7
+320,6
@@
check_for_cached_appliance (guestfs_h *g,
snprintf (filename, len, "%s/checksum", cachedir);
(void) mkdir (cachedir, 0755);
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.
/* See if the cache directory exists and passes some simple checks
* to make sure it has not been tampered with.
@@
-344,6
+343,8
@@
check_for_cached_appliance (guestfs_h *g,
return -1;
}
return -1;
}
+ (void) utime (cachedir, NULL);
+
garbage_collect_appliances (cachedir);
/* Try to open and acquire a lock on the checksum file. */
garbage_collect_appliances (cachedir);
/* Try to open and acquire a lock on the checksum file. */
@@
-418,7
+419,7
@@
build_supermin_appliance (guestfs_h *g,
if (g->verbose)
guestfs___print_timestamped_message (g, "begin building supermin appliance");
if (g->verbose)
guestfs___print_timestamped_message (g, "begin building supermin appliance");
- const char *tmpdir = guestfs_tmpdir ();
+ const char *tmpdir = guestfs_
__persistent_
tmpdir ();
/* len must be longer than the length of any pathname we can
* generate in this function.
/* len must be longer than the length of any pathname we can
* generate in this function.