Ensure TCSD (when present) is started before Clevis

Signed-off-by: Oldřich Jedlička <[email protected]>
latchset · May 7, 2024 · 358eb6b · 358eb6b
1 parent cf916f4
commit 358eb6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/luks/systemd/clevis-luks-askpass.service.in b/src/luks/systemd/clevis-luks-askpass.service.in
@@ -2,6 +2,8 @@
 Description=Forward Password Requests to Clevis
 Documentation=man:clevis-luks-unlockers(7)
 DefaultDependencies=no
+After=tcsd.service
+Wants=tcsd.service
 
 [Service]
 Type=simple

diff --git a/src/luks/systemd/clevis-tcsd.conf b/src/luks/systemd/clevis-tcsd.conf
@@ -0,0 +1,4 @@
+[Unit]
+DefaultDependencies=no
+After=local-fs.target
+Requires=local-fs.target
diff --git a/src/luks/systemd/meson.build b/src/luks/systemd/meson.build
@@ -12,6 +12,7 @@ if systemd.found() and sd_reply_pass.found()
   data.set('SYSTEMD_REPLY_PASS', sd_reply_pass.path())
 
   unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+  tcsdoverridedir = join_paths(unitdir, 'tcsd.service.d')
 
   configure_file(
     input: 'clevis-luks-askpass.service.in',
@@ -28,6 +29,7 @@ if systemd.found() and sd_reply_pass.found()
   )
 
   install_data('clevis-luks-askpass.path', install_dir: unitdir)
+  install_data('clevis-tcsd.conf', install_dir: tcsdoverridedir)
 else
   warning('Will not install systemd support due to missing dependencies!')
 endif