@@ -56,7 +56,7 @@ func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) {

 	flags.Var(opts.NewListOptsRef(&conf.DNSSearch, opts.ValidateDNSSearch), "dns-search", "DNS search domains to use")

 	flags.Var(dopts.NewNamedIPListOptsRef("host-gateway-ips", &conf.HostGatewayIPs), "host-gateway-ip", "IP addresses that the special 'host-gateway' string in --add-host resolves to. Defaults to the IP addresses of the default bridge")

 	flags.Var(opts.NewNamedListOptsRef("labels", &conf.Labels, opts.ValidateLabel), "label", "Set key=value labels to the daemon")

-	flags.StringVar(&conf.LogConfig.Type, "log-driver", "json-file", "Default driver for container logs")

+	flags.StringVar(&conf.LogConfig.Type, "log-driver", conf.LogConfig.Type, "Default driver for container logs")

 	flags.Var(opts.NewNamedMapOpts("log-opts", conf.LogConfig.Config, nil), "log-opt", "Default log driver options for containers")

 	flags.IntVar(&conf.MaxConcurrentDownloads, "max-concurrent-downloads", conf.MaxConcurrentDownloads, "Set the max concurrent downloads")

@@ -44,6 +44,8 @@ const (

 	DefaultNetworkMtu = 1500

 	// DisableNetworkBridge is the default value of the option to disable network bridge

 	DisableNetworkBridge = "none"

+	// DefaultLogDriver is the default log-driver.

+	DefaultLogDriver = "json-file"

 	// DefaultShutdownTimeout is the default shutdown timeout (in seconds) for

 	// the daemon for containers to stop when it is shutting down.

 	DefaultShutdownTimeout = 15

@@ -336,6 +338,7 @@ func New() (*Config, error) {

 		CommonConfig: CommonConfig{

 			ShutdownTimeout: DefaultShutdownTimeout,

 			LogConfig: LogConfig{

+				Type:   DefaultLogDriver,

 				Config: make(map[string]string),

 			},

 			DaemonLogConfig: DaemonLogConfig{