git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check the pid is > 0 before calling waitpid()
[libguestfs.git]
/
src
/
appliance.c
diff --git
a/src/appliance.c
b/src/appliance.c
index
1b6b505
..
99bb21f
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.
@@
-351,7
+351,11
@@
check_for_cached_appliance (guestfs_h *g,
int fd = open (filename, O_RDONLY);
if (fd == -1)
return 0;
int fd = open (filename, O_RDONLY);
if (fd == -1)
return 0;
+#ifdef HAVE_FUTIMENS
(void) futimens (fd, NULL);
(void) futimens (fd, NULL);
+#else
+ (void) futimes (fd, NULL);
+#endif
struct flock fl;
fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;
struct flock fl;
fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;
@@
-419,7
+423,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.