proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-29 02:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove pivotdir only if it was created by us

Browse Source 
The removal does not account for possible leading path components that
were also created during creation of pivotdir.

Signed-off-by: Ferenc Wagner <wferi@niif.hu>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Ferenc Wagner 2010-05-12 23:47:55 +02:00 committed by Daniel Lezcano
parent b1789442d6
commit a91d897a7b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/conf.c
View File

@ -464,6 +464,7 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
void *cbparm[2]; void *cbparm[2];
struct lxc_list mountlist, *iterator; struct lxc_list mountlist, *iterator;
int ok, still_mounted, last_still_mounted; int ok, still_mounted, last_still_mounted;
int remove_pivotdir = 0;
/* change into new root fs */ /* change into new root fs */
if (chdir(rootfs)) { if (chdir(rootfs)) {
@ -484,6 +485,7 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
return -1; return -1;
} }
remove_pivotdir = 1;
DEBUG("created '%s' directory", path); DEBUG("created '%s' directory", path);
} }
@ -573,8 +575,8 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
/* remove temporary mount point, we don't consider the removing /* remove temporary mount point, we don't consider the removing
* as fatal */ * as fatal */
if (rmdir(pivotdir)) if (remove_pivotdir && rmdir(pivotdir))
WARN("can't remove mountpoint: %m"); WARN("can't remove mountpoint '%s': %m", pivotdir);
INFO("pivoted to '%s'", rootfs); INFO("pivoted to '%s'", rootfs);
return 0; return 0;