Merge pull request #12909 from abbradar/vconsole-container

kbd module: don't setup vconsoles if we are in a container

nixos/modules/tasks/kbd.nix

@@ -12,6 +12,8 @@ let
     FONT=${config.i18n.consoleFont}
     ${colors}
   '';
+
+  setVconsole = !config.boot.isContainer;
 in
 
 {
@@ -41,14 +43,21 @@ in
 
   ###### implementation
 
-  config = {
+  config = mkMerge [
+    (mkIf (!setVconsole) {
+      systemd.services."systemd-vconsole-setup".enable = false;
+    })
 
+    (mkIf setVconsole {
       environment.systemPackages = [ pkgs.kbd ];
 
       # Let systemd-vconsole-setup.service do the work of setting up the
       # virtual consoles.  FIXME: trigger a restart of
       # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
-    environment.etc."vconsole.conf".source = vconsoleConf;
+      environment.etc = [ {
+        target = "vconsole.conf";
+        source = vconsoleConf;
+      } ];
 
       # This is identical to the systemd-vconsole-setup.service unit
       # shipped with systemd, except that it uses /dev/tty1 instead of
@@ -60,7 +69,7 @@ in
           after = [ "systemd-udev-settle.service" ];
           restartTriggers = [ vconsoleConf ];
         };
-
-  };
+    })
+  ];
 
 }