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

nixos/nixos-container: use custom path if specified by --nixos-path

Browse Source
This commit is contained in:
Maximilian Bosch 2020-02-10 15:12:00 +01:00
parent 93943acbc5
commit 31bbcc21d3
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/virtualization/nixos-container/nixos-container.pl
View File

@ -43,6 +43,7 @@ Usage: nixos-container list
[--config <string>] [--config <string>]
[--config-file <path>] [--config-file <path>]
[--flake <flakeref>] [--flake <flakeref>]
[--nixos-path <path>]
nixos-container login <container-name> nixos-container login <container-name>
nixos-container root-login <container-name> nixos-container root-login <container-name>
nixos-container run <container-name> -- args... nixos-container run <container-name> -- args...
@ -386,6 +387,7 @@ elsif ($action eq "update") {
system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0 system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
or die "$0: failed to set container configuration\n"; or die "$0: failed to set container configuration\n";
} else { } else {
my $nixosConfigFile = "$root/etc/nixos/configuration.nix"; my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
# FIXME: may want to be more careful about clobbering the existing # FIXME: may want to be more careful about clobbering the existing
@ -395,8 +397,9 @@ elsif ($action eq "update") {
writeNixOSConfig $nixosConfigFile; writeNixOSConfig $nixosConfigFile;
} }
my $nixenvF = $nixosPath // "<nixpkgs/nixos>";
system("nix-env", "-p", "$profileDir/system", system("nix-env", "-p", "$profileDir/system",
"-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>", "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF,
"--set", "-A", "system") == 0 "--set", "-A", "system") == 0
or die "$0: failed to build container configuration\n"; or die "$0: failed to build container configuration\n";
} }