0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15116 from ibuildthecloud/devices

Browse source 
Revert change to make ParseDevice unexported
This commit is contained in:
Tibor Vass 2015-07-29 14:42:30 -04:00
commit 2a593bea12
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
runconfig/parse.go
View file

@ -283,7 +283,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
// parse device mappings
deviceMappings := []DeviceMapping{}
for _, device := range flDevices.GetAll() {
deviceMapping, err := parseDevice(device)
deviceMapping, err := ParseDevice(device)
if err != nil {
return nil, nil, cmd, err
}
@ -487,7 +487,8 @@ func parseKeyValueOpts(opts opts.ListOpts) ([]KeyValuePair, error) {
return out, nil
}
func parseDevice(device string) (DeviceMapping, error) {
// ParseDevice parses a device mapping string to a DeviceMapping struct
func ParseDevice(device string) (DeviceMapping, error) {
src := ""
dst := ""
permissions := "rwm"