packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prepare-root: Only bind mount /home, /tmp, /root if they are directories 

What we expect for new systems is for these to be symbolic links:
/home -> /sysroot/home
etc.
This commit is contained in:
Colin Walters 2013-06-23 17:56:14 -04:00
parent 7bb20b0533
commit f6946a368f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/switchroot/ostree-prepare-root.c
View File

@ -180,10 +180,16 @@ main(int argc, char *argv[])
{
snprintf (srcpath, sizeof(srcpath), "%s%s", root_mountpoint, toproot_bind_mounts[i]);
snprintf (destpath, sizeof(destpath), "%s%s", deploy_path, toproot_bind_mounts[i]);
if (mount (srcpath, destpath, NULL, MS_BIND & ~MS_RDONLY, NULL) < 0)
/* Only do these bind mounts if the target exists and is a real directory,
* not a symbolic link.
*/
if (lstat (destpath, &stbuf) == 0 && S_ISDIR(stbuf.st_mode))
{
perrorv ("failed to bind mount (class:toproot) %s to %s", toproot_bind_mounts[i], destpath);
exit (1);
if (mount (srcpath, destpath, NULL, MS_BIND & ~MS_RDONLY, NULL) < 0)
{
perrorv ("failed to bind mount (class:toproot) %s to %s", toproot_bind_mounts[i], destpath);
exit (1);
}
}
}