shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity
e790e79e11
ostree/Makefile-switchroot.am

97 lines
4.4 KiB
Plaintext
Raw Normal View History

Add ostree-switch-root here Merge the code from ostree-init; now that we're back to targeting an initramfs (dracut), we don't need to statically link the binary, so there's no strong reason to have a separate module.
2012-02-06 01:02:44 +04:00
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
Add SPDX-License-Identifier to source files SPDX License List is a list of (common) open source licenses that can be referred to by a “short identifier”. It has several advantages compared to the common "license header texts" usually found in source files. Some of the advantages: * It is precise; there is no ambiguity due to variations in license header text * It is language neutral * It is easy to machine process * It is concise * It is simple and can be used without much cost in interpreted environments like java Script, etc. * An SPDX license identifier is immutable. * It provides simple guidance for developers who want to make sure the license for their code is respected See http://spdx.org for further reading. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Closes: #1439 Approved by: cgwalters
2018-01-30 22:26:26 +03:00
# SPDX-License-Identifier: LGPL-2.0+
#
Add ostree-switch-root here Merge the code from ostree-init; now that we're back to targeting an initramfs (dracut), we don't need to statically link the binary, so there's no strong reason to have a separate module.
2012-02-06 01:02:44 +04:00
# 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
Update FSF license notices to use URL instead of address
2021-12-07 04:20:55 +03:00
# License along with this library. If not, see <https://www.gnu.org/licenses/>.
Add ostree-switch-root here Merge the code from ostree-init; now that we're back to targeting an initramfs (dracut), we don't need to statically link the binary, so there's no strong reason to have a separate module.
2012-02-06 01:02:44 +04:00
Separate prepare-root static path We should have done this a long time ago. We don't have any test coverage for the no-initramfs path, and I think it's not long term supportable as we want to add more features like composefs. Particularly now that there's good support for embedding an initramfs in a kernel image, I see little value in a path for having custom static linking for this prepare root flow. That said, we will continue to make a best-effort "it compiles" attempt to support it. Fork the "pid 1" prepare root code into a new `ostree-prepare-root-static.c` file, and drop the runtime conditionals. We can drop the composefs logic from `-static.c` which ends up keeping that file much smaller. A further next step here will be to actually fold the `prepare-root.c` logic into the main `ostree` binary which we can then just include in the initramfs.
2023-06-17 17:05:22 +03:00
ostree_prepare_root_SOURCES = \
src/switchroot/ostree-mount-util.h
ostree_prepare_root_CFLAGS =
ostree_prepare_root_CPPFLAGS = $(AM_CPPFLAGS)
ostree_prepare_root_LDADD =
Add support for mkinitcpio https://bugzilla.gnome.org/show_bug.cgi?id=710682
2013-10-23 00:04:32 +04:00
if BUILDOPT_SYSTEMD
Move ostree-* executables to /usr/lib/ostree Why not to use libexecdir? Because this directory does not exist on some distros or paths between distros varies. There are several reasons why a well known path is prefered, for example when generating a kernel command line: init=${ostree}/usr/lib/ostree-boot/ostree-prepare-root In addition this saves us some typing in a console when wanting to access the "ostree" cmd line. Closes: #449 Approved by: cgwalters
2016-08-09 16:23:04 +03:00
ostree_boot_PROGRAMS += ostree-remount
build: clean up ostree-remount if building without systemd This is necessary for "make distcheck" on Travis-CI. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Closes: #600 Approved by: cgwalters
2016-11-28 22:05:53 +03:00
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
build: Add --enable-triggers-only For bootstrapping gnome-ostree, we need to install the triggers early on, before we actually build the real ostree binary.
2012-08-26 20:46:14 +04:00
endif
dracut: Add ostree-remount Linux creates a copy of the soure mount flags when creating a bind mount; if the source is read-only, then the bind mount is. The problem is that systemd will remount the rootfs read/write, but each mount (/home, /var etc.) will still be read-only. We need to remount every bind mount except for /usr to read-write too. This only "worked" with the old ostree-switch-root because it effectively force mounted the rootfs read-write always, ignoring the "ro" flag.
2013-06-04 21:18:36 +04:00
ostree-prepare-root: Allow building statically with musl If the `--with-static-compiler=musl-gcc` configure flag is given. 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 for advice on using autotools in this manner. Closes: #477 Approved by: cgwalters
2016-08-30 22:28:02 +03:00
if BUILDOPT_USE_STATIC_COMPILER
Separate prepare-root static path We should have done this a long time ago. We don't have any test coverage for the no-initramfs path, and I think it's not long term supportable as we want to add more features like composefs. Particularly now that there's good support for embedding an initramfs in a kernel image, I see little value in a path for having custom static linking for this prepare root flow. That said, we will continue to make a best-effort "it compiles" attempt to support it. Fork the "pid 1" prepare root code into a new `ostree-prepare-root-static.c` file, and drop the runtime conditionals. We can drop the composefs logic from `-static.c` which ends up keeping that file much smaller. A further next step here will be to actually fold the `prepare-root.c` logic into the main `ostree` binary which we can then just include in the initramfs.
2023-06-17 17:05:22 +03:00
ostree_prepare_root_SOURCES += src/switchroot/ostree-prepare-root-static.c
ostree-prepare-root: Allow building statically with musl If the `--with-static-compiler=musl-gcc` configure flag is given. 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 for advice on using autotools in this manner. Closes: #477 Approved by: cgwalters
2016-08-30 22:28:02 +03:00
# 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
Makefile: declare ostree_boot_SCRIPTS and append values ostree_boot_SCRIPTS was being set on both Makefile-boot.am and Makefile-switchroot.am, causing the first one to be replaced by the other at the final Makefile, so declare as empty and append on both places instead. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
2019-11-06 03:16:07 +03:00
ostree_boot_SCRIPTS += ostree-prepare-root
ostree-prepare-root: Allow building statically with musl If the `--with-static-compiler=musl-gcc` configure flag is given. 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 for advice on using autotools in this manner. Closes: #477 Approved by: cgwalters
2016-08-30 22:28:02 +03:00
ostree-prepare-root : $(ostree_prepare_root_SOURCES)
Separate prepare-root static path We should have done this a long time ago. We don't have any test coverage for the no-initramfs path, and I think it's not long term supportable as we want to add more features like composefs. Particularly now that there's good support for embedding an initramfs in a kernel image, I see little value in a path for having custom static linking for this prepare root flow. That said, we will continue to make a best-effort "it compiles" attempt to support it. Fork the "pid 1" prepare root code into a new `ostree-prepare-root-static.c` file, and drop the runtime conditionals. We can drop the composefs logic from `-static.c` which ends up keeping that file much smaller. A further next step here will be to actually fold the `prepare-root.c` logic into the main `ostree` binary which we can then just include in the initramfs.
2023-06-17 17:05:22 +03:00
$(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root-static.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) -DOSTREE_PREPARE_ROOT_STATIC=1
ci: Add "it compiles" coverage for --with-static-compiler Prep for further changes.
2023-06-27 13:26:08 +03:00
CLEANFILES += ostree-prepare-root
ostree-prepare-root: Allow building statically with musl If the `--with-static-compiler=musl-gcc` configure flag is given. 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 for advice on using autotools in this manner. Closes: #477 Approved by: cgwalters
2016-08-30 22:28:02 +03:00
else
ostree_boot_PROGRAMS += ostree-prepare-root
ostree-prepare-root: Validate ed25519 signatures when requested If requested, by specifying ot-composefs=signed=/path/to/pub.key then the commit object is validated against the specified ed25519 public key, and if valid, the composefs digest from the commit object is used to ensure we boot the right digest.
2023-07-07 12:29:31 +03:00
ostree_prepare_root_CFLAGS += $(AM_CFLAGS) -Isrc/switchroot -I$(srcdir)/composefs -I$(srcdir)/src/libostree -I$(srcdir)/src/libotcore -I$(srcdir)/src/libotutil
Separate prepare-root static path We should have done this a long time ago. We don't have any test coverage for the no-initramfs path, and I think it's not long term supportable as we want to add more features like composefs. Particularly now that there's good support for embedding an initramfs in a kernel image, I see little value in a path for having custom static linking for this prepare root flow. That said, we will continue to make a best-effort "it compiles" attempt to support it. Fork the "pid 1" prepare root code into a new `ostree-prepare-root-static.c` file, and drop the runtime conditionals. We can drop the composefs logic from `-static.c` which ends up keeping that file much smaller. A further next step here will be to actually fold the `prepare-root.c` logic into the main `ostree` binary which we can then just include in the initramfs.
2023-06-17 17:05:22 +03:00
ostree_prepare_root_SOURCES += src/switchroot/ostree-prepare-root.c
ostree-prepare-root: Validate ed25519 signatures when requested If requested, by specifying ot-composefs=signed=/path/to/pub.key then the commit object is validated against the specified ed25519 public key, and if valid, the composefs digest from the commit object is used to ensure we boot the right digest.
2023-07-07 12:29:31 +03:00
ostree_prepare_root_CPPFLAGS += $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_CRYPTO_CFLAGS) -I $(srcdir)/libglnx
ostree_prepare_root_LDADD += $(AM_LDFLAGS) $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_CRYPTO_LIBS) libotcore.la libotutil.la libglnx.la
Separate prepare-root static path We should have done this a long time ago. We don't have any test coverage for the no-initramfs path, and I think it's not long term supportable as we want to add more features like composefs. Particularly now that there's good support for embedding an initramfs in a kernel image, I see little value in a path for having custom static linking for this prepare root flow. That said, we will continue to make a best-effort "it compiles" attempt to support it. Fork the "pid 1" prepare root code into a new `ostree-prepare-root-static.c` file, and drop the runtime conditionals. We can drop the composefs logic from `-static.c` which ends up keeping that file much smaller. A further next step here will be to actually fold the `prepare-root.c` logic into the main `ostree` binary which we can then just include in the initramfs.
2023-06-17 17:05:22 +03:00
endif # BUILDOPT_USE_STATIC_COMPILER
Add ostree-switch-root here Merge the code from ostree-init; now that we're back to targeting an initramfs (dracut), we don't need to statically link the binary, so there's no strong reason to have a separate module.
2012-02-06 01:02:44 +04:00
switchroot: Move `path_is_on_readonly_fs` to header file This simplifies the build system by removing the need for `libswitchroot-mountutil.la`. Original idea by @cgwalters in #477. Closes: #478 Approved by: cgwalters
2016-08-31 00:49:15 +03:00
ostree_remount_SOURCES = \
src/switchroot/ostree-mount-util.h \
src/switchroot/ostree-remount.c \
$(NULL)
remount: Use new metadata in `/run/ostree-booted` for composefs Since we now have a generalized more structured way of serializing state in the initramfs instead of "stamp files", use it for passing the composefs state.
2023-07-13 14:47:32 +03:00
ostree_remount_CPPFLAGS = $(AM_CPPFLAGS) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -Isrc/switchroot -I$(srcdir)/src/libotcore -I$(srcdir)/src/libotutil -I$(srcdir)/libglnx
ostree_remount_LDADD = $(AM_LDFLAGS) $(OT_INTERNAL_GIO_UNIX_LIBS) libotcore.la libotutil.la libglnx.la
Switch to using a systemd generator for /var 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
2017-05-11 21:54:12 +03:00
Support transient /etc If the `prepare-root.conf` file contains: ``` [etc] transient=yes ``` Then during prepare-root, an overlayfs is mounted as /etc, with the upper dir being in /run. If composefs is used, the lower dir is `usr/etc` from the composefs image , or it is the deployed `$deploydir/usr/etc`. Note that for this to work with selinux, the commit must have been built with OSTREE_REPO_COMMIT_MODIFIER_FLAGS_USRETC_AS_ETC. Otherwise the lowerdir (/usr/etc) will have the wrong selinux contexts for the final location of the mount (/etc). We also set the transient-etc key in the ostree-booted file, pointing it to the directory that is used for the overlayfs. There are some additional work happening in ostree-remount, mostly related to selinux (as this needs to happen post selinux policy load): * Recent versions of selinux-poliy have issues with the overlayfs mount being kernel_t, and that is not allowed to manage files as needed. This is fixed in https://github.com/fedora-selinux/selinux-policy/pull/1893 * Any /etc files created in the initramfs will not be labeled, because the selinux policy has not been loaded. In addition, the upper dir is on a tmpfs, and any manually set xattr-based selinux labels on those are reset during policy load. To work around this ostree-remount will relabel all files on /etc that have corresponding files in overlayfs upper dir. * During early boot, systemd mounts /run/machine-id on top of /etc/machine-id (as /etc is readonly). Later during boot, when etc is readwrite, systemd-machine-id-commit.service will remove the mount and update the real file under it with the right content. To ensure that this keeps working, we need to ensure that when we relabel /etc/machine-id we relabel the real (covered) file, not the temporary bind-mount. * ostree-remount no longer needs to remount /etc read-only in the transient-etc case. Signed-off-by: Alexander Larsson <alexl@redhat.com>
2023-09-29 14:37:22 +03:00
if USE_SELINUX
ostree_remount_CPPFLAGS += $(OT_DEP_SELINUX_CFLAGS)
ostree_remount_LDADD += $(OT_DEP_SELINUX_LIBS)
endif
prepare-root: Support using composefs as root filesystem This changes ostree-prepare-root to use the .ostree.cfs image as a composefs filesystem, instead of the checkout. By default, composefs is used if support is built in and the .ostree.cfs file exists in the deploy dir, otherwise we fall back to the old method. However, if the ot-composefs kernel option is specified this can be tweaked as per: * off: Never use composefsz * maybe: Use if possible * on: Fail if not possible * signed: Fail if the cfs image is not fs-verity signed with a key in the keyring. * digest=....: Fail if the cfs image does not match the specified digest. The final layout when composefs is active is: / ro overlayfs mount for composefs /sysroot "real" root /etc rw bind mount to $deploydir/etc /var rw bind mount to $vardir We also specify the $deploydir/.ostree-mnt directory as the (internal) mountpoint for the erofs mount for composefs. This can be used to map the root fs back to the deploy id/dir in use, A further note: I didn't test the .usr-ovl-work overlayfs case, but a comment mentions that you can't mount overlayfs on top of a readonly mount. That seems incompatible with composefs. If this is needed we have to merge that with the overlayfs that composefs itself sets up, which is possible with the libcomposefs APIs.
2022-06-30 15:53:13 +03:00
if USE_COMPOSEFS
Update submodule: composefs Instead of using pkg-config, etc we just include composefs. In the end the library is just 5 c source files, and it is set up to be easy to use as a submodule. For now, composefs support is disabled by default.
2023-05-23 11:31:23 +03:00
ostree_prepare_root_LDADD += libcomposefs.la
prepare-root: Support using composefs as root filesystem This changes ostree-prepare-root to use the .ostree.cfs image as a composefs filesystem, instead of the checkout. By default, composefs is used if support is built in and the .ostree.cfs file exists in the deploy dir, otherwise we fall back to the old method. However, if the ot-composefs kernel option is specified this can be tweaked as per: * off: Never use composefsz * maybe: Use if possible * on: Fail if not possible * signed: Fail if the cfs image is not fs-verity signed with a key in the keyring. * digest=....: Fail if the cfs image does not match the specified digest. The final layout when composefs is active is: / ro overlayfs mount for composefs /sysroot "real" root /etc rw bind mount to $deploydir/etc /var rw bind mount to $vardir We also specify the $deploydir/.ostree-mnt directory as the (internal) mountpoint for the erofs mount for composefs. This can be used to map the root fs back to the deploy id/dir in use, A further note: I didn't test the .usr-ovl-work overlayfs case, but a comment mentions that you can't mount overlayfs on top of a readonly mount. That seems incompatible with composefs. If this is needed we have to merge that with the overlayfs that composefs itself sets up, which is possible with the libcomposefs APIs.
2022-06-30 15:53:13 +03:00
endif
ostree-prepare-root: Log journal message after finding deployment Log a structured journal message when resolving the deployment path. This will be used by the `rpm-ostree history` command to find past deployments the system has booted into. Closes: #1842 Approved by: cgwalters
2018-09-25 22:42:28 +03:00
if BUILDOPT_SYSTEMD
ostree_prepare_root_CPPFLAGS += -DHAVE_SYSTEMD=1
prepare-root: Link to glib Since we've split off the "prepare root as init" code into a separate file, we can now use glib to parse the config file again, which is a lot less hacky. This is particularly motivated by composefs, where we want to do more in the initramfs. Future patches may also link to parts of libostree.
2023-06-21 20:25:52 +03:00
ostree_prepare_root_LDADD += $(LIBSYSTEMD_LIBS)
ostree-prepare-root: Log journal message after finding deployment Log a structured journal message when resolving the deployment path. This will be used by the `rpm-ostree history` command to find past deployments the system has booted into. Closes: #1842 Approved by: cgwalters
2018-09-25 22:42:28 +03:00
endif
Switch to using a systemd generator for /var 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
2017-05-11 21:54:12 +03:00
# 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)
build: Add distcheck configure flags to fix systemd and bash-completion When running distcheck, the systemd system-generator and bash-completion scripts are installed in absolute paths (/usr and /lib) as looked up from their pkg-config files. This breaks distcheck. Use a ${prefix}-relative path for both of them when configuring for distcheck. Signed-off-by: Philip Withnall <withnall@endlessm.com> Closes: #1103 Approved by: cgwalters
2017-08-22 20:32:43 +03:00
# Allow the distcheck install under $prefix test to pass
AM_DISTCHECK_CONFIGURE_FLAGS += --with-systemdsystemgeneratordir='$${libdir}/systemd/system-generators'
Switch to using a systemd generator for /var 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
2017-05-11 21:54:12 +03:00
endif
Reference in New Issue Copy Permalink