[lxc-devel] [lxd/master] lxd: Fix auto init without a storage backend

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180324/c748f5c4/attachment.bin>
-------------- next part --------------
From b858714d4db40dbf56397dadf9fc37c3323c3f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 23 Mar 2018 23:18:23 -0400
Subject: [PATCH] lxd: Fix auto init without a storage backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/main_init_auto.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxd/main_init_auto.go b/lxd/main_init_auto.go
index c7dbe95ab..432838a67 100644
--- a/lxd/main_init_auto.go
+++ b/lxd/main_init_auto.go
@@ -13,11 +13,11 @@ import (
 
 func (c *cmdInit) RunAuto(cmd *cobra.Command, args []string, d lxd.ContainerServer) (*initData, error) {
 	// Sanity checks
-	if !shared.StringInSlice(c.flagStorageBackend, supportedStoragePoolDrivers) {
+	if c.flagStorageBackend != "" && !shared.StringInSlice(c.flagStorageBackend, supportedStoragePoolDrivers) {
 		return nil, fmt.Errorf("The requested backend '%s' isn't supported by lxd init", c.flagStorageBackend)
 	}
 
-	if !shared.StringInSlice(c.flagStorageBackend, c.availableStorageDrivers()) {
+	if c.flagStorageBackend != "" && !shared.StringInSlice(c.flagStorageBackend, c.availableStorageDrivers()) {
 		return nil, fmt.Errorf("The requested backend '%s' isn't available on your system (missing tools)", c.flagStorageBackend)
 	}