colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make "nixos-container login" an alias of "machinectl login"

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-18 20:47:31 +02:00
parent 0121688424
commit 5ee5aa1b90
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/modules/virtualisation/container-config.nix
View File

@ -13,34 +13,9 @@ with lib;
# Shut up warnings about not having a boot loader.
system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
# Provide a login prompt on /var/lib/login.socket. On the host,
# you can connect to it by running ‘socat
# unix:<path-to-container>/var/lib/login.socket -,echo=0,raw’.
systemd.sockets.login =
{ description = "Login Socket";
wantedBy = [ "sockets.target" ];
socketConfig =
{ ListenStream = "/var/lib/login.socket";
SocketMode = "0666";
Accept = true;
};
};
systemd.services."login@" =
{ description = "Login %i";
environment.TERM = "linux";
serviceConfig =
{ Type = "simple";
StandardInput = "socket";
ExecStart = "${pkgs.socat}/bin/socat -t0 - exec:${pkgs.shadow}/bin/login,pty,setsid,setpgid,stderr,ctty";
TimeoutStopSec = 1; # FIXME
};
restartIfChanged = false;
};
# Also provide a root login prompt on /var/lib/root-login.socket
# that doesn't ask for a password. This socket can only be used by
# root on the host.
# Provide a root login prompt on /var/lib/root-login.socket that
# doesn't ask for a password. This socket can only be used by root
# on the host.
systemd.sockets.root-login =
{ description = "Root Login Socket";
wantedBy = [ "sockets.target" ];

2
nixos/modules/virtualisation/nixos-container.pl
View File

@ -203,7 +203,7 @@ elsif ($action eq "update") {
}
elsif ($action eq "login") {
exec($socat, "unix:$root/var/lib/login.socket", "-,echo=0,raw");
exec("machinectl", "login", "--", $containerName);
}
elsif ($action eq "root-login") {