diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 6d28c2a4d61..ec2e05c387a 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -6,6 +6,7 @@ use File::Path; use File::Slurp; use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); +use Cwd 'abs_path'; my $nsenter = "@utillinux@/bin/nsenter"; my $su = "@su@"; @@ -18,13 +19,13 @@ umask 0022; sub showHelp { print < [--nixos-path ] [--system-path ] [--config ] [--ensure-unique-name] [--auto-start] + nixos-container create [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] nixos-container destroy nixos-container start nixos-container stop nixos-container kill [--signal ] nixos-container status - nixos-container update [--config ] [--nixos-path ] + nixos-container update [--config ] [--config-file ] nixos-container login nixos-container root-login nixos-container run -- args... @@ -40,6 +41,7 @@ my $ensureUniqueName = 0; my $autoStart = 0; my $extraConfig; my $signal; +my $configFile; GetOptions( "help" => sub { showHelp() }, @@ -48,11 +50,16 @@ GetOptions( "system-path=s" => \$systemPath, "signal=s" => \$signal "nixos-path=s" => \$nixosPath, - "config=s" => \$extraConfig + "config=s" => \$extraConfig, + "config-file=s" => \$configFile ) or exit 1; my $action = $ARGV[0] or die "$0: no action specified\n"; +if (defined $configFile and defined $extraConfig) { + die "--config and --config-file are mutually incompatible. " . + "Please define on or the other, but not both"; +} # Execute the selected action. @@ -73,6 +80,17 @@ $containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n"; sub writeNixOSConfig { my ($nixosConfigFile) = @_; + my $localExtraConfig = ""; + + + + if ($extraConfig) { + $localExtraConfig = $extraConfig + } elsif ($configFile) { + my $resolvedFile = abs_path($configFile); + $localExtraConfig = "imports = [ $resolvedFile ];" + } + my $nixosConfig = <"; system("nix-env", "-p", "$profileDir/system", - "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", + "-I", "nixos-config=$nixosConfigFile", "-f", "", "--set", "-A", "system") == 0 or die "$0: failed to build container configuration\n";