Skip to content

Commit

Permalink
tools: use fclose() after fdopen() + add newline
Browse files Browse the repository at this point in the history
So far we accidently used close() on the original file descriptor. (After
fdopen() the original fd is considered private and should not be used anymore.
The close operations should be performed on the new file handle. We did the
correct thing on error but not on success.) Using close() on the original fd
caused "Text file busy" errors and prevented the cloned tmpfs container from
starting.

Signed-off-by: Christian Brauner <cbrauner@suse.de>
  • Loading branch information
Christian Brauner committed Aug 13, 2016
1 parent 4b281e1 commit b44c42e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/lxc/tools/lxc_copy.c
Expand Up @@ -454,7 +454,7 @@ static int do_clone_ephemeral(struct lxc_container *c,

if (arg->tmpfs && !my_args.quiet)
printf("Container is placed on tmpfs.\nRebooting will cause "
"all changes made to it to be lost!");
"all changes made to it to be lost!\n");

if (!arg->daemonize && arg->argc) {
clone->want_daemonize(clone, true);
Expand Down Expand Up @@ -863,7 +863,7 @@ static char *mount_tmpfs(const char *oldname, const char *newname,
goto err_close;
}

close(fd);
fclose(fp);
return premount;

err_close:
Expand Down

0 comments on commit b44c42e

Please sign in to comment.