diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-06-05 18:38:38 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-06-06 11:49:16 +0200 |
| commit | f6d03359b3810dca112e1190eeec7f18a3bab247 (patch) | |
| tree | 93b34a85138c20c4e187395d6e3b47dfe451d41d /nixos | |
| parent | d5afbf8235ef7dc002d4a087e8d27391ce6bb122 (diff) | |
| download | nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.tar nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.tar.gz nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.tar.bz2 nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.tar.lz nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.tar.xz nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.tar.zst nixlib-f6d03359b3810dca112e1190eeec7f18a3bab247.zip | |
Only overwrite container-configuration when --config is specified.
Fixes #2834.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/nixos-container.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 718630fe8b9b..5083abd84489 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -31,7 +31,7 @@ EOF } my $ensureUniqueName = 0; -my $extraConfig = ""; +my $extraConfig; GetOptions( "help" => sub { showHelp() }, @@ -190,7 +190,7 @@ elsif ($action eq "update") { # FIXME: may want to be more careful about clobbering the existing # configuration.nix. - writeNixOSConfig $nixosConfigFile if defined $extraConfig; + writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne ""); system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>", |