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

Only overwrite container-configuration when --config is specified.

Browse Source 
Fixes #2834.
This commit is contained in:
Moritz Ulrich 2014-06-05 18:38:38 +02:00
parent d5afbf8235
commit f6d03359b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ EOF
} }
my $ensureUniqueName = 0; my $ensureUniqueName = 0;
my $extraConfig = ""; my $extraConfig;
GetOptions( GetOptions(
"help" => sub { showHelp() }, "help" => sub { showHelp() },
@ -190,7 +190,7 @@ elsif ($action eq "update") {
# FIXME: may want to be more careful about clobbering the existing # FIXME: may want to be more careful about clobbering the existing
# configuration.nix. # configuration.nix.
writeNixOSConfig $nixosConfigFile if defined $extraConfig; writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne "");
system("nix-env", "-p", "$profileDir/system", system("nix-env", "-p", "$profileDir/system",
"-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>", "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",