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

If container name is already unique, don't append "-0"

Browse Source 
When using `--ensure-unique-name`, don't needlessly append `"-0"` if the
container name is already unique.

This is especially helpful with NixOps since when it deploys to a
container it uses `--ensure-unique-name`.  This means that the container
name will never match the deployment host due to the `"-0"`.  Having the
container name and the host name match isn't exactly a requirement, but
it's nice to have and a small change.
This commit is contained in:
Peter Jones 2015-11-18 10:47:25 -07:00 committed by Rok Garbas
parent 109ba4c861
commit 5b8c871842
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/nixos-container.pl Normal file → Executable file
View File

@ -97,10 +97,10 @@ if ($action eq "create") {
if ($ensureUniqueName) { if ($ensureUniqueName) {
my $base = $containerName; my $base = $containerName;
for (my $nr = 0; ; $nr++) { for (my $nr = 0; ; $nr++) {
$containerName = "$base-$nr";
$confFile = "/etc/containers/$containerName.conf"; $confFile = "/etc/containers/$containerName.conf";
$root = "/var/lib/containers/$containerName"; $root = "/var/lib/containers/$containerName";
last unless -e $confFile || -e $root; last unless -e $confFile || -e $root;
$containerName = "$base-$nr";
} }
} }