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

switchroot: Bind mount /lib/modules after we mount /lib 

Otherwise we don't ge the right /lib/modules.
This commit is contained in:
Colin Walters 2012-02-13 10:56:13 -05:00
parent dd4982ff29
commit 8729997eab
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/switchroot/ostree-switch-root.c
View File

@ -283,14 +283,6 @@ main(int argc, char *argv[])
} }
} }
snprintf (srcpath, sizeof(srcpath), "/ostree/modules");
snprintf (destpath, sizeof(destpath), "/ostree/%s/lib/modules", ostree_target);
if (mount (srcpath, destpath, NULL, MS_MGC_VAL|MS_BIND, NULL) < 0)
{
perrorv ("failed to bind mount (class:bind) %s to %s", srcpath, destpath);
exit (1);
}
for (i = 0; readonly_bind_mounts[i] != NULL; i++) for (i = 0; readonly_bind_mounts[i] != NULL; i++)
{ {
snprintf (destpath, sizeof(destpath), "/ostree/%s%s", ostree_target, readonly_bind_mounts[i]); snprintf (destpath, sizeof(destpath), "/ostree/%s%s", ostree_target, readonly_bind_mounts[i]);
@ -305,7 +297,16 @@ main(int argc, char *argv[])
exit (1); exit (1);
} }
} }
/* This should come after we've bind mounted /lib */
snprintf (srcpath, sizeof(srcpath), "/ostree/modules");
snprintf (destpath, sizeof(destpath), "/ostree/%s/lib/modules", ostree_target);
if (mount (srcpath, destpath, NULL, MS_MGC_VAL|MS_BIND, NULL) < 0)
{
perrorv ("failed to bind mount %s to %s", srcpath, destpath);
exit (1);
}
snprintf (destpath, sizeof(destpath), "/ostree/%s", ostree_target); snprintf (destpath, sizeof(destpath), "/ostree/%s", ostree_target);
if (chroot (destpath) < 0) if (chroot (destpath) < 0)
{ {