about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMilan Pässler <milan@petabyte.dev>2021-01-15 14:56:29 +0100
committerMilan Pässler <milan@petabyte.dev>2021-01-15 15:00:11 +0100
commit40000911235ca99ed5af4330356fb76ffeb6197d (patch)
tree51a565f8a9fe1928a3e788bf37c48fbc94d09796 /nixos
parentf53cf9a65c83c400aec421cb2eb105acc75431f6 (diff)
nixos/docker: change misleading error message
The socketActivation option was removed, but later on socket activation
was added back without the option to disable it. The description now reflects
that socket activation is used unconditionally in the current setup.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/docker.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 83d90d9fc97e1..689f664b676d5 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -216,7 +216,7 @@ in
   ]);
 
   imports = [
-    (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot")
+    (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active")
   ];
 
 }