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

prepare-root: Update comments

This commit is contained in:
Colin Walters 2015-02-04 05:32:45 -05:00
parent 4f75d4ea0b
commit e739677ea1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,9 @@ main(int argc, char *argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
/* Create a temporary target for our mounts in the initramfs; this will
* be moved to the new system root below.
*/
snprintf (newroot, sizeof(newroot), "%s.tmp", root_mountpoint); snprintf (newroot, sizeof(newroot), "%s.tmp", root_mountpoint);
if (mkdir (newroot, 0755) < 0) if (mkdir (newroot, 0755) < 0)
{ {
@ -182,6 +185,7 @@ main(int argc, char *argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
/* Link to the physical root below the deployment root */
snprintf (destpath, sizeof(destpath), "%s/sysroot", newroot); snprintf (destpath, sizeof(destpath), "%s/sysroot", newroot);
if (mount (root_mountpoint, destpath, NULL, MS_BIND, NULL) < 0) if (mount (root_mountpoint, destpath, NULL, MS_BIND, NULL) < 0)
{ {
@ -189,6 +193,7 @@ main(int argc, char *argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
/* Link to the deployment's /var */
snprintf (srcpath, sizeof(srcpath), "%s/../../var", deploy_path); snprintf (srcpath, sizeof(srcpath), "%s/../../var", deploy_path);
snprintf (destpath, sizeof(destpath), "%s/var", newroot); snprintf (destpath, sizeof(destpath), "%s/var", newroot);
if (mount (srcpath, destpath, NULL, MS_MGC_VAL|MS_BIND, NULL) < 0) if (mount (srcpath, destpath, NULL, MS_MGC_VAL|MS_BIND, NULL) < 0)
@ -197,6 +202,7 @@ main(int argc, char *argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
/* Set up any read-only bind mounts (notably /usr) */
for (i = 0; readonly_bind_mounts[i] != NULL; i++) for (i = 0; readonly_bind_mounts[i] != NULL; i++)
{ {
snprintf (destpath, sizeof(destpath), "%s%s", newroot, readonly_bind_mounts[i]); snprintf (destpath, sizeof(destpath), "%s%s", newroot, readonly_bind_mounts[i]);
@ -214,10 +220,10 @@ main(int argc, char *argv[])
touch_run_ostree (); touch_run_ostree ();
/* In preparation for the hack below, unmount the original /sysroot. /* Unmount the previous /sysroot now. Otherwise, we would be
* Otherwise, we would be placing our newroot mount on top of an * placing our newroot mount on top of an existing mount, and after
* existing mount, and after we do a switch_root, we would no longer * we do a switch_root, we would no longer be able to ever unmount
* be able to ever unmount the original mount. * the original mount.
*/ */
if (umount (root_mountpoint) < 0) if (umount (root_mountpoint) < 0)
{ {
@ -225,9 +231,9 @@ main(int argc, char *argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
/* This is a bit hacky - move our deployment to /sysroot, since /* Now that we've set up all the bind mounts in /sysroot.tmp which
* systemd's initrd-switch-root target hardcodes looking for it * points to the deployment, move it /sysroot. From there,
* there. * systemd's initrd-switch-root.target will take over.
*/ */
if (mount (newroot, root_mountpoint, NULL, MS_MOVE, NULL) < 0) if (mount (newroot, root_mountpoint, NULL, MS_MOVE, NULL) < 0)
{ {