summary refs log tree commit diff
path: root/nixos/modules/services/system/cloud-init.nix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-09-01 03:07:23 +0200
committerFlorian Klink <flokli@flokli.de>2019-09-01 19:06:38 +0200
commitf74735c9d7e7b978827ff17b5f8cb375753dca0b (patch)
tree75809b54a017e6ac94cf507f14cf83387299b877 /nixos/modules/services/system/cloud-init.nix
parent7f42adf7a2a6ab0f18dd441820f1089a7b2c0cfd (diff)
downloadnixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.tar
nixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.tar.gz
nixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.tar.bz2
nixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.tar.lz
nixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.tar.xz
nixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.tar.zst
nixpkgs-f74735c9d7e7b978827ff17b5f8cb375753dca0b.zip
nixos: remove dependencies on local-fs.target
Since https://github.com/NixOS/nixpkgs/pull/61321, local-fs.target is
part of sysinit.target again, meaning units without
DefaultDependencies=no will automatically depend on it, and the manual
set dependencies can be dropped.
Diffstat (limited to 'nixos/modules/services/system/cloud-init.nix')
-rw-r--r--nixos/modules/services/system/cloud-init.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 3ad555f78ef..15fe822aec6 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -112,8 +112,6 @@ in
     systemd.services.cloud-init-local =
       { description = "Initial cloud-init job (pre-networking)";
         wantedBy = [ "multi-user.target" ];
-        wants = [ "local-fs.target" ];
-        after = [ "local-fs.target" ];
         path = path;
         serviceConfig =
           { Type = "oneshot";
@@ -127,9 +125,9 @@ in
     systemd.services.cloud-init =
       { description = "Initial cloud-init job (metadata service crawler)";
         wantedBy = [ "multi-user.target" ];
-        wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service"
+        wants = [ "network-online.target" "cloud-init-local.service"
                   "sshd.service" "sshd-keygen.service" ];
-        after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ];
+        after = [ "network-online.target" "cloud-init-local.service" ];
         before = [ "sshd.service" "sshd-keygen.service" ];
         requires = [ "network.target "];
         path = path;