From 35d704c8a006263d1539994f02c7bfbe97202528 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Tue, 9 Apr 2013 18:08:03 -0700
Subject: [PATCH] Change the volumes type to map[string]string to store both
 source and destination

---
 commands.go  | 6 +++---
 container.go | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/commands.go b/commands.go
index cb7b57ff00..5f5f8d36f9 100644
--- a/commands.go
+++ b/commands.go
@@ -915,21 +915,21 @@ func (opts AttachOpts) Get(val string) bool {
 }
 
 // PathOpts stores a unique set of absolute paths
-type PathOpts map[string]struct{}
+type PathOpts map[string]string
 
 func NewPathOpts() PathOpts {
 	return make(PathOpts)
 }
 
 func (opts PathOpts) String() string {
-	return fmt.Sprintf("%v", map[string]struct{}(opts))
+	return fmt.Sprintf("%v", map[string]string(opts))
 }
 
 func (opts PathOpts) Set(val string) error {
 	if !filepath.IsAbs(val) {
 		return fmt.Errorf("%s is not an absolute path", val)
 	}
-	opts[filepath.Clean(val)] = struct{}{}
+	opts[filepath.Clean(val)] = ""
 	return nil
 }
 
diff --git a/container.go b/container.go
index 109c8b158b..aaa8723662 100644
--- a/container.go
+++ b/container.go
@@ -66,7 +66,7 @@ type Config struct {
 	Cmd          []string
 	Dns          []string
 	Image        string // Name of the image as it was passed by the operator (eg. could be symbolic)
-	Volumes      map[string]struct{}
+	Volumes      map[string]string
 }
 
 func ParseRun(args []string, stdout io.Writer, capabilities *Capabilities) (*Config, error) {
@@ -461,6 +461,7 @@ func (container *Container) Start() error {
 
 	// Init the lock
 	container.waitLock = make(chan struct{})
+
 	container.ToDisk()
 	go container.monitor()
 	return nil