Colin Walters
30705889cb
If one wants to set up a mount for `/var` in `/etc/fstab`, it won't be mounted since `ostree-prepare-root` set up a bind mount for `/var` to `/sysroot/ostree/$stateroot/var`, and systemd will take the already extant mount over what's in `/etc/fstab`. There are a few options to fix this, but what I settled on is parsing `/etc/fstab` in a generator (exactly like `systemd-fstab-generator` does), except here we look for an explicit mount for `/var`, and if one *isn't* found, synthesize the default ostree mount to the stateroot. Another nice property is that if an admin creates a `var.mount` unit in `/etc` for example, that will also override our mount. Note that today ostree doesn't hard depend on systemd, so this behavior only kicks in if we're built with systemd *and* libmount support (for parsing `/etc/fstab`). I didn't really test that case though. Initially I started writing this as a "pure libc" program, but at one point decided to use `libostree.so` to find the booted deployment. That didn't work out because `/boot` wasn't necessarily mounted and hence we couldn't find the bootloader config. A leftover artifact from this is that the generator code calls into libostree via the "cmd private" infrastructure. But it's an easy way to share code, and doesn't hurt. Closes: #859 Approved by: jlebon
57 lines
1.8 KiB
C
57 lines
1.8 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
|
*
|
|
* Copyright (C) 2014 Colin Walters <walters@verbum.org>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "ostree-cmdprivate.h"
|
|
#include "ostree-repo-private.h"
|
|
#include "ostree-core-private.h"
|
|
#include "ostree-repo-static-delta-private.h"
|
|
#include "ostree-sysroot.h"
|
|
#include "ostree-bootloader-grub2.h"
|
|
|
|
#include "otutil.h"
|
|
|
|
static gboolean
|
|
impl_ostree_generate_grub2_config (OstreeSysroot *sysroot, int bootversion, int target_fd, GCancellable *cancellable, GError **error)
|
|
{
|
|
return _ostree_bootloader_grub2_generate_config (sysroot, bootversion, target_fd, cancellable, error);
|
|
}
|
|
|
|
/**
|
|
* ostree_cmdprivate: (skip)
|
|
*
|
|
* Do not call this function; it is used to share private API between
|
|
* the OSTree commandline and the library.
|
|
*/
|
|
const OstreeCmdPrivateVTable *
|
|
ostree_cmd__private__ (void)
|
|
{
|
|
static OstreeCmdPrivateVTable table = {
|
|
_ostree_impl_system_generator,
|
|
impl_ostree_generate_grub2_config,
|
|
_ostree_repo_static_delta_dump,
|
|
_ostree_repo_static_delta_query_exists,
|
|
_ostree_repo_static_delta_delete
|
|
};
|
|
|
|
return &table;
|
|
}
|