diff --git a/cmd/ignite/run/images.go b/cmd/ignite/run/images.go index df175b8a9..30e397da0 100644 --- a/cmd/ignite/run/images.go +++ b/cmd/ignite/run/images.go @@ -1,6 +1,8 @@ package run import ( + "os" + api "github.com/weaveworks/ignite/pkg/apis/ignite" "github.com/weaveworks/ignite/pkg/providers" "github.com/weaveworks/ignite/pkg/util" @@ -14,6 +16,11 @@ type ImagesOptions struct { func NewImagesOptions() (io *ImagesOptions, err error) { io = &ImagesOptions{} io.allImages, err = providers.Client.Images().FindAll(filter.NewAllFilter()) + // If the storage is uninitialized, avoid failure and continue with empty + // image list. + if err != nil && os.IsNotExist(err) { + err = nil + } return } diff --git a/cmd/ignite/run/kernels.go b/cmd/ignite/run/kernels.go index b252ca9e5..f8b26e685 100644 --- a/cmd/ignite/run/kernels.go +++ b/cmd/ignite/run/kernels.go @@ -1,6 +1,8 @@ package run import ( + "os" + api "github.com/weaveworks/ignite/pkg/apis/ignite" "github.com/weaveworks/ignite/pkg/providers" "github.com/weaveworks/ignite/pkg/util" @@ -14,6 +16,11 @@ type KernelsOptions struct { func NewKernelsOptions() (ko *KernelsOptions, err error) { ko = &KernelsOptions{} ko.allKernels, err = providers.Client.Kernels().FindAll(filter.NewAllFilter()) + // If the storage is uninitialized, avoid failure and continue with empty + // kernel list. + if err != nil && os.IsNotExist(err) { + err = nil + } return } diff --git a/cmd/ignite/run/ps.go b/cmd/ignite/run/ps.go index ee8ce17b3..35d10a18c 100644 --- a/cmd/ignite/run/ps.go +++ b/cmd/ignite/run/ps.go @@ -3,7 +3,7 @@ package run import ( "bytes" "fmt" - "strings" + "os" "text/template" "github.com/pkg/errors" @@ -40,7 +40,7 @@ func (pf *PsFlags) NewPsOptions() (po *PsOptions, err error) { po.allVMs, err = providers.Client.VMs().FindAll(filter.NewVMFilterAll("", po.All)) // If the storage is uninitialized, avoid failure and continue with empty // VM list. - if err != nil && strings.Contains(err.Error(), "no such file or directory") { + if err != nil && os.IsNotExist(err) { err = nil } return