diff options
| author | Colin Walters <walters@verbum.org> | 2021-06-16 09:26:24 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2021-06-16 09:40:28 -0400 |
| commit | 73e3ccc401829025a9151fddff29d67a0ac2321d (patch) | |
| tree | 5fb1163f57f84ec63b4e6f4f1efd0691ea7993ca /configure.ac | |
| parent | f8496098eed306a5f5ccee95e03339e474221f23 (diff) | |
| download | ostree-73e3ccc401829025a9151fddff29d67a0ac2321d.tar.gz | |
Use generator to enable ostree-remount.service and ostree-finalize-staged.path
We struggled for a long time with enablement of our "internal units",
trying to follow the philosophy that units should only be enabled
by explicit preset.
See https://bugzilla.redhat.com/show_bug.cgi?id=1451458
and https://github.com/coreos/rpm-ostree/pull/1482
etc.
And I just saw chat (RH internal on a proprietary system sadly) where
someone hit `ostree-remount.service` not being enabled in CentOS8.
Thinking about this more, I realized we've shipped a systemd generator
for a long time and while its only role until now was to generate `var.mount`,
but by using it to force on our internal units, we don't require
people to deal with presets anymore.
Basically we're inverting things so that "if ostree= is on the kernel
cmdline, then enable our units" and not "enable our units, but have
them use ConditionKernelCmdline=ostree to skip".
Drop the weird gyrations we were doing around `ostree-finalize-staged.path`
too; forking `systemctl start` is just asking for bugs.
So after this, hopefully we won't ever again have to think about
distribution presets and our units.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f37b9cb3..82b9cf32 100644 --- a/configure.ac +++ b/configure.ac @@ -499,6 +499,7 @@ AS_IF([test "x$with_libsystemd" = "xyes"], [ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) + AC_DEFINE_UNQUOTED([SYSTEM_DATA_UNIT_PATH], ["$with_systemdsystemunitdir"], ["unit path"]) ]) AC_ARG_WITH([systemdsystemgeneratordir], AS_HELP_STRING([--with-systemdsystemgeneratordir=DIR], [Directory for systemd generators]), |