From 45d9c54b9a8f23f9bd0e8a9305066058e4dddf3c Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Sat, 2 May 2015 23:06:20 -0700
Subject: [PATCH] Rename userdocker to docker to be more consistent with other
 distros

---
 config/default.go                                      | 10 +++++-----
 scripts/dockerimages/{05-userdocker => 05-docker}      |  0
 .../dockerimages/{11-userdockerwait => 11-dockerwait}  |  0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename scripts/dockerimages/{05-userdocker => 05-docker} (100%)
 rename scripts/dockerimages/{11-userdockerwait => 11-dockerwait} (100%)

diff --git a/config/default.go b/config/default.go
index a7d9f0cd..f6a471b3 100644
--- a/config/default.go
+++ b/config/default.go
@@ -279,8 +279,8 @@ func NewConfig() *Config {
 				},
 				LogDriver: "json-file",
 			},
-			"userdocker": {
-				Image:      "userdocker",
+			"docker": {
+				Image:      "docker",
 				Restart:    "always",
 				Privileged: true,
 				Pid:        "host",
@@ -296,15 +296,15 @@ func NewConfig() *Config {
 					"all-volumes",
 				},
 			},
-			"userdockerwait": {
-				Image: "userdockerwait",
+			"dockerwait": {
+				Image: "dockerwait",
 				Net:   "host",
 				Labels: project.NewSliceorMap(map[string]string{
 					DETACH: "false",
 					SCOPE:  SYSTEM,
 				}),
 				Links: []string{
-					"userdocker",
+					"docker",
 				},
 				VolumesFrom: []string{
 					"all-volumes",
diff --git a/scripts/dockerimages/05-userdocker b/scripts/dockerimages/05-docker
similarity index 100%
rename from scripts/dockerimages/05-userdocker
rename to scripts/dockerimages/05-docker
diff --git a/scripts/dockerimages/11-userdockerwait b/scripts/dockerimages/11-dockerwait
similarity index 100%
rename from scripts/dockerimages/11-userdockerwait
rename to scripts/dockerimages/11-dockerwait