Skip to content

Commit fcf131b

Browse files
committed
bootc-fstab-edit: improve service dependencies
Looking at the target definitions: - multi-user.target Requires basic.target - basic.target Requires sysinit.target - sysinit.target Wants local-fs.target - local-fs.target is After local-fs-pre.target local-fs-pre.target is wanted by some services, but it's indirect, so it's cleaner to be WantedBy local-fs.target and Wants local-fs-pre.target. While at it add Conflicts=shutdown.target. Signed-off-by: Etienne Champetier <[email protected]>
1 parent 1343980 commit fcf131b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lib/src/generator.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,18 @@ fn generate_fstab_editor(unit_dir: &Dir) -> Result<()> {
7272
EDIT_UNIT,
7373
"[Unit]\n\
7474
DefaultDependencies=no\n\
75+
Conflicts=shutdown.target\n\
7576
After=systemd-fsck-root.service\n\
7677
Before=local-fs-pre.target local-fs.target shutdown.target systemd-remount-fs.service\n\
78+
Wants=local-fs-pre.target\n\
7779
\n\
7880
[Service]\n\
7981
Type=oneshot\n\
8082
RemainAfterExit=yes\n\
8183
ExecStart=bootc internals fixup-etc-fstab\n\
8284
",
8385
)?;
84-
let target = "local-fs-pre.target.wants";
86+
let target = "local-fs.target.wants";
8587
unit_dir.create_dir_all(target)?;
8688
unit_dir.symlink(&format!("../{EDIT_UNIT}"), &format!("{target}/{EDIT_UNIT}"))?;
8789
Ok(())

0 commit comments

Comments
 (0)