diff options
| author | Colin Walters <walters@verbum.org> | 2013-06-29 11:45:53 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-07-07 11:31:26 -0400 |
| commit | bb6eedfb258d3001f61c42c7e920c03dae2bdc1a (patch) | |
| tree | bfce00f47de8191e5ef7709f3112f1757f9d8306 /src/ostree/ot-admin-builtin-os-init.c | |
| parent | ecb3f0de035c09d8b280ac116eeede483638fd5d (diff) | |
| download | ostree-bb6eedfb258d3001f61c42c7e920c03dae2bdc1a.tar.gz | |
[INCOMPATIBLE CHANGE] Implement new deployment model
See https://wiki.gnome.org/OSTree/DeploymentModel2
This is a major rework of the on-disk filesystem layout, and the boot
process. OSTree now explicitly supports upgrading kernels, and these
upgrades are also atomic.
The core concept of the new model is the "deployment list", which is
an ordered list of bootable operating system trees. The deployment
list is reflected in the bootloader configuration; which has a kernel
argument that tells the initramfs (dracut) which operating system root
to use.
Invidiual notable changes that come along with this:
1) Operating systems should now come with their etc in usr/etc; OSTree
will perform a 3-way merge at deployment time, and place etc in
the actual root. This avoids the need for a bind mount, and is
just a lot cleaner.
2) OSTree no longer bind mounts /root, /home, and /tmp. It is expected
that the the OS/ has these as symbolic links into /var.
At the moment, OSTree only supports managing syslinux; other
bootloader backends will follow.
Diffstat (limited to 'src/ostree/ot-admin-builtin-os-init.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-os-init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c index 0536167a..8d725fda 100644 --- a/src/ostree/ot-admin-builtin-os-init.c +++ b/src/ostree/ot-admin-builtin-os-init.c @@ -38,7 +38,6 @@ ot_admin_builtin_os_init (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, GOptionContext *context; gboolean ret = FALSE; const char *osname = NULL; - GFile *ostree_dir = admin_opts->ostree_dir; ot_lobj GFile *deploy_dir = NULL; ot_lobj GFile *dir = NULL; __attribute__((unused)) GCancellable *cancellable = NULL; @@ -49,7 +48,7 @@ ot_admin_builtin_os_init (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, if (!g_option_context_parse (context, &argc, &argv, error)) goto out; - if (!ot_admin_ensure_initialized (ostree_dir, cancellable, error)) + if (!ot_admin_ensure_initialized (admin_opts->sysroot, cancellable, error)) goto out; if (argc < 2) @@ -60,7 +59,7 @@ ot_admin_builtin_os_init (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, osname = argv[1]; - deploy_dir = ot_gfile_get_child_build_path (ostree_dir, "deploy", osname, NULL); + deploy_dir = ot_gfile_get_child_build_path (admin_opts->sysroot, "ostree", "deploy", osname, NULL); /* Ensure core subdirectories of /var exist, since we need them for * dracut generation, and the host will want them too. Note that at |