From 1de6e898a76913432bf0a81fc6def979d35fdf53 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Sat, 4 Apr 2015 10:17:10 -0700
Subject: [PATCH] setup groups and socket files on startup

---
 config/default.go | 1 +
 init/init.go      | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/config/default.go b/config/default.go
index 5da2d8e5..8a598fce 100644
--- a/config/default.go
+++ b/config/default.go
@@ -22,6 +22,7 @@ func NewConfig() *Config {
 				"none",
 				"--restart=false",
 				"-g", "/var/lib/system-docker",
+				"-G", "root",
 				"-H", DOCKER_SYSTEM_HOST,
 			},
 		},
diff --git a/init/init.go b/init/init.go
index 5274494c..285550c0 100644
--- a/init/init.go
+++ b/init/init.go
@@ -3,6 +3,7 @@ package init
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"os/exec"
 	"strings"
@@ -346,6 +347,7 @@ func RunInit() error {
 		func(cfg *config.Config) error {
 			return createSymlinks(cfg, symlinks)
 		},
+		createGroups,
 		extractModules,
 		loadModules,
 		setResolvConf,
@@ -362,6 +364,7 @@ func RunInit() error {
 		func(cfg *config.Config) error {
 			return createMounts(postMounts...)
 		},
+		touchSocket,
 		remountRo,
 		sysInit,
 	}