summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2021-02-22 23:22:04 +0100
committerGitHub <noreply@github.com>2021-02-22 23:22:04 +0100
commit47589ade46e649818e0f89fdf42ef31d0222b231 (patch)
tree7be9ee43b6a987255ce36ab0a09825928a329130 /nixos/modules/config
parenteb01bbdf8c4dcd10b249102febeda0f82f3126e9 (diff)
parent9be052921004f45a34af2e7a42bd88078b480502 (diff)
downloadnixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.tar
nixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.tar.gz
nixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.tar.bz2
nixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.tar.lz
nixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.tar.xz
nixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.tar.zst
nixpkgs-47589ade46e649818e0f89fdf42ef31d0222b231.zip
Merge pull request #113804 from rnhmjoj/no-udev-settle-2
nixos/console: fix console setting reloading
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/console.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 1339227f1e0..84ad76246fd 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -144,11 +144,16 @@ in
           ''}
         '';
 
-        systemd.services.systemd-vconsole-setup =
-          {
-            before = optional config.services.xserver.enable "display-manager.service";
-            after = [ "systemd-udev-settle.service" ];
+        systemd.services.reload-systemd-vconsole-setup =
+          { description = "Reset console on configuration changes";
+            wantedBy = [ "multi-user.target" ];
             restartTriggers = [ vconsoleConf consoleEnv ];
+            reloadIfChanged = true;
+            serviceConfig =
+              { RemainAfterExit = true;
+                ExecStart = "${pkgs.coreutils}/bin/true";
+                ExecReload = "/run/current-system/systemd/bin/systemctl restart systemd-vconsole-setup";
+              };
           };
       }