diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-16 17:27:11 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-16 17:27:11 -0400 |
| commit | 44d091674bce1f5ff783e8773bfb4abc0f2cd04c (patch) | |
| tree | 20ae4160c8b944c99dfb3f84816ea0946c6cee3d /modules/services/ttys | |
| parent | bf15293b1efc4eda36e535cec043ba4fdace9b44 (diff) | |
| parent | 1d5748942771c6d39df0030e36819b47002d460a (diff) | |
| download | nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.gz nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.bz2 nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.lz nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.xz nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.zst nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.zip | |
Merge branch 'master' of github.com:NixOS/nixos into systemd
Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix
Diffstat (limited to 'modules/services/ttys')
| -rw-r--r-- | modules/services/ttys/agetty.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix index 43ee81481bff..42d276c96664 100644 --- a/modules/services/ttys/agetty.nix +++ b/modules/services/ttys/agetty.nix @@ -72,7 +72,7 @@ with pkgs.lib; [Service] Environment=TERM=linux - Environment=LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive + Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400 Type=idle Restart=always |