diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2018-10-30 10:12:40 -0500 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-10-30 10:12:40 -0500 |
commit | dcb68d1aa24b2dd00d793f5a66f96cc5403b43c3 (patch) | |
tree | 230cc7586cf8d333680f27b915a65cf587e72a6b /pkg | |
parent | eb4c2035aef32fd7f0037bbea0447205fcd29d33 (diff) | |
parent | ce24ce7c530f8fb0354d3af7b394240a3915b733 (diff) | |
download | podman-dcb68d1aa24b2dd00d793f5a66f96cc5403b43c3.tar.gz podman-dcb68d1aa24b2dd00d793f5a66f96cc5403b43c3.tar.bz2 podman-dcb68d1aa24b2dd00d793f5a66f96cc5403b43c3.zip |
Merge branch 'master' of github.com:containers/libpod into vendor
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/spec/config_linux.go | 2 | ||||
-rw-r--r-- | pkg/spec/parse.go | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkg/spec/config_linux.go b/pkg/spec/config_linux.go index 20cdcc458..5bf8eff43 100644 --- a/pkg/spec/config_linux.go +++ b/pkg/spec/config_linux.go @@ -28,7 +28,7 @@ func Device(d *configs.Device) spec.LinuxDevice { } func addDevice(g *generate.Generator, device string) error { - src, dst, permissions, err := parseDevice(device) + src, dst, permissions, err := ParseDevice(device) if err != nil { return err } diff --git a/pkg/spec/parse.go b/pkg/spec/parse.go index 9b2dd1347..4d20e35d4 100644 --- a/pkg/spec/parse.go +++ b/pkg/spec/parse.go @@ -148,21 +148,21 @@ func getLoggingPath(opts []string) string { return "" } -// parseDevice parses device mapping string to a src, dest & permissions string -func parseDevice(device string) (string, string, string, error) { //nolint +// ParseDevice parses device mapping string to a src, dest & permissions string +func ParseDevice(device string) (string, string, string, error) { //nolint src := "" dst := "" permissions := "rwm" arr := strings.Split(device, ":") switch len(arr) { case 3: - if !validDeviceMode(arr[2]) { + if !IsValidDeviceMode(arr[2]) { return "", "", "", fmt.Errorf("invalid device mode: %s", arr[2]) } permissions = arr[2] fallthrough case 2: - if validDeviceMode(arr[1]) { + if IsValidDeviceMode(arr[1]) { permissions = arr[1] } else { if arr[1][0] != '/' { @@ -183,9 +183,9 @@ func parseDevice(device string) (string, string, string, error) { //nolint return src, dst, permissions, nil } -// validDeviceMode checks if the mode for device is valid or not. -// Valid mode is a composition of r (read), w (write), and m (mknod). -func validDeviceMode(mode string) bool { +// IsValidDeviceMode checks if the mode for device is valid or not. +// IsValid mode is a composition of r (read), w (write), and m (mknod). +func IsValidDeviceMode(mode string) bool { var legalDeviceMode = map[rune]bool{ 'r': true, 'w': true, |