mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 08:59:36 +00:00
Code Issues Releases Wiki Activity

factor out pivot_root code

Browse Source 
Clean up and factor a bit the pivot_root code.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Daniel LEzcano
2010-05-10 11:50:09 +02:00
committed by Daniel Lezcano
parent 1b09f2c057
commit 0b7a835335
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lxc/conf.c
View File

@@ -457,14 +457,12 @@ static int setup_rootfs_pivot_root_cb(char *buffer, void *data)
return 0;
}
static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
{
char path[MAXPATHLEN];
void *cbparm[2];
struct lxc_list mountlist, *iterator;
int ok, still_mounted, last_still_mounted;
int pivotdir_is_temp = 0;
/* change into new root fs */
if (chdir(rootfs)) {
@@ -472,34 +470,20 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
return -1;
}
/* create temporary mountpoint if none specified */
if (!pivotdir) {
if (!pivotdir)
pivotdir = "oldrootfs";
snprintf(path, sizeof(path), "./lxc-oldrootfs-XXXXXX" );
if (!mkdtemp(path)) {
SYSERROR("can't make temporary mountpoint");
/* create a default mountpoint if none specified */
snprintf(path, sizeof(path), "%s/%s", rootfs, pivotdir);
if (access(path, F_OK)) {
if (mkdir_p(path, 0755)) {
SYSERROR("failed to create pivotdir '%s'", path);
return -1;
}
pivotdir = strdup(&path[1]); /* get rid of leading dot */
if (!pivotdir) {
SYSERROR("strdup failed");
return -1;
}
pivotdir_is_temp = 1;
} else {
snprintf(path, sizeof(path), "%s/%s", rootfs, pivotdir);
if (access(path, F_OK)) {
if (mkdir_p(path, 0755)) {
SYSERROR("failed to create pivotdir '%s'", path);
return -1;
}
DEBUG("created '%s' directory", path);
}
DEBUG("created '%s' directory", path);
}
DEBUG("mountpoint for old rootfs is '%s'", path);
@@ -588,8 +572,8 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
/* remove temporary mount point, we don't consider the removing
* as fatal */
if (pivotdir_is_temp && rmdir(pivotdir))
WARN("can't remove temporary mountpoint: %m");
if (rmdir(pivotdir))
WARN("can't remove mountpoint: %m");
INFO("pivoted to '%s'", rootfs);
return 0;