@@ -27,7 +27,36 @@ func (d *Daemon) dumpDaemon(dir string) (string, error) {

 		return "", errors.Wrap(err, "failed to open file to write the daemon datastructure dump")

 	}

 	defer f.Close()

-	spew.Fdump(f, d) // Does not return an error

+

+	dump := struct {

+		containers      interface{}

+		names           interface{}

+		links           interface{}

+		execs           interface{}

+		volumes         interface{}

+		images          interface{}

+		layers          interface{}

+		imageReferences interface{}

+		downloads       interface{}

+		uploads         interface{}

+		registry        interface{}

+		plugins         interface{}

+	}{

+		containers:      d.containers,

+		execs:           d.execCommands,

+		volumes:         d.volumes,

+		images:          d.imageStore,

+		layers:          d.layerStore,

+		imageReferences: d.referenceStore,

+		downloads:       d.downloadManager,

+		uploads:         d.uploadManager,

+		registry:        d.RegistryService,

+		plugins:         d.PluginStore,

+		names:           d.nameIndex,

+		links:           d.linkIndex,

+	}

+

+	spew.Fdump(f, dump) // Does not return an error

 	f.Sync()

 	return path, nil

 }