diff options
author | Peter Jones <pjones@pmade.com> | 2015-11-18 10:47:25 -0700 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2016-01-20 03:46:19 +0100 |
commit | 5b8c8718420671f7af2b0189299a55e43c252d5b (patch) | |
tree | a8fc0b43123bcd5fa0083b6d708824359c98d31c /nixos | |
parent | 109ba4c86166f9b7aa31ba45869ee93b0eecb2e0 (diff) | |
download | nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.tar nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.tar.gz nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.tar.bz2 nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.tar.lz nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.tar.xz nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.tar.zst nixlib-5b8c8718420671f7af2b0189299a55e43c252d5b.zip |
If container name is already unique, don't append "-0"
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.
Diffstat (limited to 'nixos')
-rwxr-xr-x[-rw-r--r--] | nixos/modules/virtualisation/nixos-container.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 004385f728c6..eda57a9751eb 100644..100755 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -97,10 +97,10 @@ if ($action eq "create") { if ($ensureUniqueName) { my $base = $containerName; for (my $nr = 0; ; $nr++) { - $containerName = "$base-$nr"; $confFile = "/etc/containers/$containerName.conf"; $root = "/var/lib/containers/$containerName"; last unless -e $confFile || -e $root; + $containerName = "$base-$nr"; } } |