Merge branch 'staging-next' into staging

2021-03-05 20:39:38 +01:00
parent 69b16f1251 4fcaf2b443
commit 3f2e5044ce
31 changed files with 254 additions and 55 deletions
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -458,7 +458,9 @@ elsif ($action eq "run") {

 elsif ($action eq "show-ip") {
    my $s = read_file($confFile) or die;
-    $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m or die "$0: cannot get IP address\n";
+    $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m
+        or $s =~ /^LOCAL_ADDRESS6=([0-9a-f:]+)(\/[0-9]+)?$/m
+        or die "$0: cannot get IP address\n";
    print "$1\n";
 }