diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-06-12 03:15:19 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-07-28 20:34:03 +0200 |
| commit | b0d3095fd6cc1791a38f57a1982116b4475244ba (patch) | |
| tree | f415bd813a7e07599c969fdd4965390bfdf38cd6 /src/integritysetup | |
| parent | Merge pull request #28551 from mrc0mmand/unit-cleanup-set (diff) | |
| download | systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.tar.xz systemd-b0d3095fd6cc1791a38f57a1982116b4475244ba.zip | |
Drop split-usr and unmerged-usr support
As previously announced, execute order 66:
https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html
The meson options split-usr, rootlibdir and rootprefix become no-ops
that print a warning if they are set to anything other than the
default values. We can remove them in a future release.
Diffstat (limited to 'src/integritysetup')
| -rw-r--r-- | src/integritysetup/integritysetup-generator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/integritysetup/integritysetup-generator.c b/src/integritysetup/integritysetup-generator.c index 5df6d81a84..05154908ae 100644 --- a/src/integritysetup/integritysetup-generator.c +++ b/src/integritysetup/integritysetup-generator.c @@ -101,8 +101,8 @@ static int create_disk( "Type=oneshot\n" "RemainAfterExit=yes\n" "TimeoutSec=infinity\n" - "ExecStart=" ROOTLIBEXECDIR "/systemd-integritysetup attach '%s' '%s' '%s' '%s'\n" - "ExecStop=" ROOTLIBEXECDIR "/systemd-integritysetup detach '%s'\n", + "ExecStart=" LIBEXECDIR "/systemd-integritysetup attach '%s' '%s' '%s' '%s'\n" + "ExecStop=" LIBEXECDIR "/systemd-integritysetup detach '%s'\n", name_escaped, device, empty_to_dash(key_file_escaped), empty_to_dash(options), name_escaped); |