summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-08-13 15:51:14 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-08-18 10:27:44 +0200
commitdb5276215ae496074c163fca4014baf1bcd05984 (patch)
treebadcb50a8cafed9eaf3af8db42e17d1b70500e05 /units
parent45bcfcb36cec9bf810686ed956ff215ac1db07d5 (diff)
downloadsystemd-db5276215ae496074c163fca4014baf1bcd05984.tar.gz
initrd-parse-etc: override argv[0] to avoid dracut issue
Quoting https://github.com/systemd/systemd/pull/24054#issuecomment-1210501631: > this would need a patch in dracut, specifically adding the > systemd-sysroot-fstab-check to the list of installed stuff: > https://github.com/dracutdevs/dracut/blob/fe8fa2b0cadbb33e27c8dd8b5851548dcd65835c/modules.d/00systemd/module-setup.sh#L47. > > I could do this manually in the CI (and I guess I'd have to do it anyway even > if the patch lands in upstream, since it won't be available in C8S), but it > should get there first before merging this PR, otherwise it's going to break > Rawhide.
Diffstat (limited to 'units')
-rw-r--r--units/initrd-parse-etc.service.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service.in
index 5ac7a24bb0..fe0e860150 100644
--- a/units/initrd-parse-etc.service.in
+++ b/units/initrd-parse-etc.service.in
@@ -21,7 +21,9 @@ OnFailureJobMode=replace-irreversibly
[Service]
Type=oneshot
-ExecStart={{ROOTLIBEXECDIR}}/systemd-sysroot-fstab-check
+# FIXME: once dracut is patched to install the symlink, change to:
+# ExecStart={{ROOTLIBEXECDIR}}/systemd-sysroot-fstab-check
+ExecStart=@{{SYSTEM_GENERATOR_DIR}}/systemd-fstab-generator systemd-sysroot-fstab-check
# We want to enqueue initrd-cleanup.service/start after we finished the part
# above. It can't be part of the initial transaction, because non-oneshot units