diff options
| author | Matthias Berndt <matthias_berndt@gmx.de> | 2023-05-05 00:02:27 +0200 |
|---|---|---|
| committer | Matthias Berndt <matthias_berndt@gmx.de> | 2023-05-07 18:48:28 +0200 |
| commit | 9f1bc0fa02647fb826968f5d217c204feb38babc (patch) | |
| tree | 3bf7b70f374f46e0276db27a15a31765d079ee5d /nixos | |
| parent | 1632e73b19cd25ac3bc0c27f07e932728c3e893c (diff) | |
| download | nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.tar nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.tar.gz nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.tar.bz2 nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.tar.lz nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.tar.xz nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.tar.zst nixlib-9f1bc0fa02647fb826968f5d217c204feb38babc.zip | |
address review comments
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stratisroot.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/stratisroot.nix b/nixos/modules/system/boot/stratisroot.nix index b4e2dbde6d4c..a53d2c496306 100644 --- a/nixos/modules/system/boot/stratisroot.nix +++ b/nixos/modules/system/boot/stratisroot.nix @@ -39,13 +39,13 @@ in stratis-setup = { description = "setup for Stratis root filesystem"; unitConfig.DefaultDependencies = "no"; - conflicts = [ "shutdown.target" ]; + conflicts = [ "shutdown.target" "initrd-switch-root.target" ]; onFailure = [ "emergency.target" ]; unitConfig.OnFailureJobMode = "isolate"; - wants = [ "stratisd-min.service" "plymouth-start.service" "stratis-clevis-setup.service" ]; + wants = [ "stratisd-min.service" "plymouth-start.service" ]; wantedBy = [ "initrd.target" ]; after = [ "paths.target" "plymouth-start.service" "stratisd-min.service" ]; - before = [ "initrd.target" ]; + before = [ "initrd.target" "shutdown.target" "initrd-switch-root.target" ]; environment.STRATIS_ROOTFS_UUID = config.boot.stratis.rootPoolUuid; serviceConfig = { Type = "oneshot"; |