mirror of
https://github.com/ostreedev/ostree.git
synced 2024-10-27 01:55:35 +03:00
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
72 lines
3.1 KiB
Plaintext
72 lines
3.1 KiB
Plaintext
# Copyright (C) 2011 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.
|
|
|
|
if BUILDOPT_SYSTEMD
|
|
ostree_boot_PROGRAMS += ostree-remount
|
|
else
|
|
# It is built anyway as a side-effect of having the symlink in tests/,
|
|
# and if we declare it here, it gets cleaned up properly
|
|
check_PROGRAMS += ostree-remount
|
|
endif
|
|
|
|
ostree_prepare_root_SOURCES = \
|
|
src/switchroot/ostree-mount-util.h \
|
|
src/switchroot/ostree-prepare-root.c \
|
|
$(NULL)
|
|
ostree_prepare_root_CPPFLAGS = $(AM_CPPFLAGS)
|
|
|
|
if BUILDOPT_USE_STATIC_COMPILER
|
|
# ostree-prepare-root can be used as init in a system without a populated /lib.
|
|
# To support this use case we need to link statically as we will be unable to
|
|
# locate libc.so at run time if it's not installed in /lib.
|
|
#
|
|
# We support building ostree-prepare-root with a different compiler to the rest
|
|
# of ostree so we can use musl rather than glibc. This reduces the size of the
|
|
# executable significantly: from ~700K -> ~30K. We have to use _SCRIPTS here
|
|
# to get autotools to install this as an executable but without generating rules
|
|
# to make it itself which we have specified manually. See
|
|
# https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html
|
|
ostree_boot_SCRIPTS = ostree-prepare-root
|
|
|
|
ostree-prepare-root : $(ostree_prepare_root_SOURCES)
|
|
$(STATIC_COMPILER) -o $@ -static $(ostree_prepare_root_SOURCES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES)
|
|
else
|
|
ostree_boot_PROGRAMS += ostree-prepare-root
|
|
ostree_prepare_root_CFLAGS = $(AM_CFLAGS) -Isrc/switchroot
|
|
endif
|
|
|
|
ostree_remount_SOURCES = \
|
|
src/switchroot/ostree-mount-util.h \
|
|
src/switchroot/ostree-remount.c \
|
|
$(NULL)
|
|
ostree_remount_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/switchroot
|
|
|
|
# This is the "new mode" of using a generator for /var; see
|
|
# https://github.com/ostreedev/ostree/issues/855
|
|
if BUILDOPT_SYSTEMD_AND_LIBMOUNT
|
|
ostree_prepare_root_CPPFLAGS += -DHAVE_SYSTEMD_AND_LIBMOUNT=1
|
|
ostree_remount_CPPFLAGS += -DHAVE_SYSTEMD_AND_LIBMOUNT=1
|
|
|
|
systemdsystemgenerator_PROGRAMS = ostree-system-generator
|
|
GITIGNOREFILES += $(systemdsystemgenerator_PROGRAMS)
|
|
ostree_system_generator_SOURCES = src/switchroot/ostree-mount-util.h \
|
|
src/switchroot/ostree-system-generator.c
|
|
ostree_system_generator_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libostree
|
|
ostree_system_generator_CFLAGS = $(AM_CFLAGS) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
|
|
ostree_system_generator_LDADD = $(AM_LDFLAGS) libglnx.la libostree-1.la $(OT_INTERNAL_GIO_UNIX_LIBS)
|
|
endif
|