@@ -14,7 +14,6 @@ type HostConfig struct {

 	PortBindings    nat.PortMap

 	Links           []string

 	PublishAllPorts bool

-	DriverOptions   map[string][]string

 }

 func ContainerHostConfigFromJob(job *engine.Job) *HostConfig {

@@ -25,7 +24,6 @@ func ContainerHostConfigFromJob(job *engine.Job) *HostConfig {

 	}

 	job.GetenvJson("LxcConf", &hostConfig.LxcConf)

 	job.GetenvJson("PortBindings", &hostConfig.PortBindings)

-	job.GetenvJson("DriverOptions", &hostConfig.DriverOptions)

 	if Binds := job.GetenvList("Binds"); Binds != nil {

 		hostConfig.Binds = Binds

 	}

@@ -45,7 +45,6 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf

 		flDnsSearch   = opts.NewListOpts(opts.ValidateDomain)

 		flVolumesFrom opts.ListOpts

 		flLxcOpts     opts.ListOpts

-		flDriverOpts  opts.ListOpts

 		flEnvFile     opts.ListOpts

 		flAutoRemove      = cmd.Bool([]string{"#rm", "-rm"}, false, "Automatically remove the container when it exits (incompatible with -d)")

@@ -79,8 +78,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf

 	cmd.Var(&flDns, []string{"#dns", "-dns"}, "Set custom dns servers")

 	cmd.Var(&flDnsSearch, []string{"-dns-search"}, "Set custom dns search domains")

 	cmd.Var(&flVolumesFrom, []string{"#volumes-from", "-volumes-from"}, "Mount volumes from the specified container(s)")

-	cmd.Var(&flLxcOpts, []string{"#lxc-conf", "#-lxc-conf"}, "(lxc exec-driver only) Add custom lxc options --lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")

-	cmd.Var(&flDriverOpts, []string{"o", "-opt"}, "Add custom driver options")

+	cmd.Var(&flLxcOpts, []string{"#lxc-conf", "-lxc-conf"}, "(lxc exec-driver only) Add custom lxc options --lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")

 	if err := cmd.Parse(args); err != nil {

 		return nil, nil, cmd, err

@@ -224,11 +222,6 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf

 		WorkingDir:      *flWorkingDir,

 	}

-	driverOptions, err := parseDriverOpts(flDriverOpts)

-	if err != nil {

-		return nil, nil, cmd, err

-	}

-

 	hostConfig := &HostConfig{

 		Binds:           binds,

 		ContainerIDFile: *flContainerIDFile,

@@ -237,7 +230,6 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf

 		PortBindings:    portBindings,

 		Links:           flLinks.GetAll(),

 		PublishAllPorts: *flPublishAll,

-		DriverOptions:   driverOptions,

 	}

 	if sysInfo != nil && flMemory > 0 && !sysInfo.SwapLimit {

@@ -361,12 +361,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 func populateCommand(c *Container) {

 	var (

 		en           *execdriver.Network

-		driverConfig = c.hostConfig.DriverOptions

-	)

-

-	if driverConfig == nil {

 		driverConfig = make(map[string][]string)

-	}

+	)

 	en = &execdriver.Network{

 		Mtu:       c.runtime.config.Mtu,