[lxc-devel] [lxd/master] 2016 03 22/lxdinit

[hallyn on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 337 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160322/ac59ebf0/attachment.bin>
-------------- next part --------------
From d145343155f6ce543ddaa10fb060915812ee23a6 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Mon, 21 Mar 2016 23:37:48 -0700
Subject: [PATCH 1/2] lxd init: clarify no port is wanted with server address

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
---
 lxd/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/main.go b/lxd/main.go
index cfc62b2..91623a4 100644
--- a/lxd/main.go
+++ b/lxd/main.go
@@ -721,7 +721,7 @@ func setupLXD() error {
 		}
 
 		if askBool("Would you like LXD to be available over the network (yes/no)? ") {
-			networkAddress = askString("Address to bind LXD to: ")
+			networkAddress = askString("Address to bind LXD to (not including port): ")
 			networkPort = askInt("Port to bind LXD to: ", 1, 65535)
 			trustPassword = askPassword("Trust password for new clients: ")
 		}

From cc47d1dd7041dc6aa6800d904c49e9b9ea4903ed Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Mon, 21 Mar 2016 23:38:43 -0700
Subject: [PATCH 2/2] lxd init: accept empty trust password

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
---
 lxd/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/main.go b/lxd/main.go
index 91623a4..345f8f3 100644
--- a/lxd/main.go
+++ b/lxd/main.go
@@ -605,7 +605,7 @@ func setupLXD() error {
 			inSecond := string(pwd)
 			inSecond = strings.TrimSuffix(inSecond, "\n")
 
-			if len(inFirst) != 0 && inFirst == inSecond {
+			if inFirst == inSecond {
 				return inFirst
 			}