File 0003-update-based-on-latest-spec.patch of Package oci-runtime-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-update-based-on-latest-spec.patch of Package oci-runtime-tools (Revision 73b105e352f48b857c95794d990b0784)

Currently displaying revision 73b105e352f48b857c95794d990b0784 , Show latest

From 9dc5032538dc1b2d62310f4d513abd3e343de45c Mon Sep 17 00:00:00 2001
From: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date: Mon, 14 Nov 2016 14:53:13 +0800
Subject: [PATCH 3/4] update based on latest spec

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
---
 .../src/github.com/urfave/cli/context.go           | 276 --------
 .../src/github.com/urfave/cli/flag-types.json      |  93 ---
 .../src/github.com/urfave/cli/flag_generated.go    | 627 ------------------
 .../src/github.com/urfave/cli/generate-flag-types  | 255 -------
 cmd/runtimetest/main.go                            |   8 +-
 generate/generate.go                               |  46 +-
 generate/seccomp/parse_action.go                   |  16 +-
 generate/seccomp/parse_architecture.go             |   2 +-
 generate/seccomp/parse_arguments.go                |  12 +-
 generate/seccomp/parse_remove.go                   |   8 +-
 generate/seccomp/seccomp_default.go                | 730 ++++++++++-----------
 generate/seccomp/syscall_compare.go                |  26 +-
 generate/spec.go                                   |  12 +-
 validate/validate.go                               |   8 +-
 vendor/github.com/urfave/cli/CHANGELOG.md          |   7 -
 vendor/github.com/urfave/cli/app.go                |  26 -
 vendor/github.com/urfave/cli/command.go            |  15 -
 vendor/github.com/urfave/cli/context.go            |  18 +-
 vendor/github.com/urfave/cli/errors.go             |   4 -
 vendor/github.com/urfave/cli/flag.go               |  51 --
 vendor/github.com/urfave/cli/generate-flag-types   |   7 +
 21 files changed, 456 insertions(+), 1791 deletions(-)
 delete mode 100644 Godeps/_workspace/src/github.com/urfave/cli/context.go
 delete mode 100644 Godeps/_workspace/src/github.com/urfave/cli/flag-types.json
 delete mode 100644 Godeps/_workspace/src/github.com/urfave/cli/flag_generated.go
 delete mode 100755 Godeps/_workspace/src/github.com/urfave/cli/generate-flag-types

diff --git a/Godeps/_workspace/src/github.com/urfave/cli/context.go b/Godeps/_workspace/src/github.com/urfave/cli/context.go
deleted file mode 100644
index cb89e92a086d..000000000000
--- a/Godeps/_workspace/src/github.com/urfave/cli/context.go
+++ /dev/null
@@ -1,276 +0,0 @@
-package cli
-
-import (
-	"errors"
-	"flag"
-	"reflect"
-	"strings"
-	"syscall"
-)
-
-// Context is a type that is passed through to
-// each Handler action in a cli application. Context
-// can be used to retrieve context-specific Args and
-// parsed command-line options.
-type Context struct {
-	App           *App
-	Command       Command
-	shellComplete bool
-	flagSet       *flag.FlagSet
-	setFlags      map[string]bool
-	parentContext *Context
-}
-
-// NewContext creates a new context. For use in when invoking an App or Command action.
-func NewContext(app *App, set *flag.FlagSet, parentCtx *Context) *Context {
-	c := &Context{App: app, flagSet: set, parentContext: parentCtx}
-
-	if parentCtx != nil {
-		c.shellComplete = parentCtx.shellComplete
-	}
-
-	return c
-}
-
-// NumFlags returns the number of flags set
-func (c *Context) NumFlags() int {
-	return c.flagSet.NFlag()
-}
-
-// Set sets a context flag to a value.
-func (c *Context) Set(name, value string) error {
-	return c.flagSet.Set(name, value)
-}
-
-// GlobalSet sets a context flag to a value on the global flagset
-func (c *Context) GlobalSet(name, value string) error {
-	return globalContext(c).flagSet.Set(name, value)
-}
-
-// IsSet determines if the flag was actually set
-func (c *Context) IsSet(name string) bool {
-	if c.setFlags == nil {
-		c.setFlags = make(map[string]bool)
-
-		c.flagSet.Visit(func(f *flag.Flag) {
-			c.setFlags[f.Name] = true
-		})
-
-		c.flagSet.VisitAll(func(f *flag.Flag) {
-			if _, ok := c.setFlags[f.Name]; ok {
-				return
-			}
-			c.setFlags[f.Name] = false
-		})
-
-		// XXX hack to support IsSet for flags with EnvVar
-		//
-		// There isn't an easy way to do this with the current implementation since
-		// whether a flag was set via an environment variable is very difficult to
-		// determine here. Instead, we intend to introduce a backwards incompatible
-		// change in version 2 to add `IsSet` to the Flag interface to push the
-		// responsibility closer to where the information required to determine
-		// whether a flag is set by non-standard means such as environment
-		// variables is avaliable.
-		//
-		// See https://github.com/urfave/cli/issues/294 for additional discussion
-		flags := c.Command.Flags
-		if c.Command.Name == "" { // cannot == Command{} since it contains slice types
-			if c.App != nil {
-				flags = c.App.Flags
-			}
-		}
-		for _, f := range flags {
-			eachName(f.GetName(), func(name string) {
-				if isSet, ok := c.setFlags[name]; isSet || !ok {
-					return
-				}
-
-				val := reflect.ValueOf(f)
-				if val.Kind() == reflect.Ptr {
-					val = val.Elem()
-				}
-
-				envVarValue := val.FieldByName("EnvVar")
-				if !envVarValue.IsValid() {
-					return
-				}
-
-				eachName(envVarValue.String(), func(envVar string) {
-					envVar = strings.TrimSpace(envVar)
-					if _, ok := syscall.Getenv(envVar); ok {
-						c.setFlags[name] = true
-						return
-					}
-				})
-			})
-		}
-	}
-
-	return c.setFlags[name]
-}
-
-// GlobalIsSet determines if the global flag was actually set
-func (c *Context) GlobalIsSet(name string) bool {
-	ctx := c
-	if ctx.parentContext != nil {
-		ctx = ctx.parentContext
-	}
-
-	for ; ctx != nil; ctx = ctx.parentContext {
-		if ctx.IsSet(name) {
-			return true
-		}
-	}
-	return false
-}
-
-// FlagNames returns a slice of flag names used in this context.
-func (c *Context) FlagNames() (names []string) {
-	for _, flag := range c.Command.Flags {
-		name := strings.Split(flag.GetName(), ",")[0]
-		if name == "help" {
-			continue
-		}
-		names = append(names, name)
-	}
-	return
-}
-
-// GlobalFlagNames returns a slice of global flag names used by the app.
-func (c *Context) GlobalFlagNames() (names []string) {
-	for _, flag := range c.App.Flags {
-		name := strings.Split(flag.GetName(), ",")[0]
-		if name == "help" || name == "version" {
-			continue
-		}
-		names = append(names, name)
-	}
-	return
-}
-
-// Parent returns the parent context, if any
-func (c *Context) Parent() *Context {
-	return c.parentContext
-}
-
-// value returns the value of the flag coressponding to `name`
-func (c *Context) value(name string) interface{} {
-	return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
-}
-
-// Args contains apps console arguments
-type Args []string
-
-// Args returns the command line arguments associated with the context.
-func (c *Context) Args() Args {
-	args := Args(c.flagSet.Args())
-	return args
-}
-
-// NArg returns the number of the command line arguments.
-func (c *Context) NArg() int {
-	return len(c.Args())
-}
-
-// Get returns the nth argument, or else a blank string
-func (a Args) Get(n int) string {
-	if len(a) > n {
-		return a[n]
-	}
-	return ""
-}
-
-// First returns the first argument, or else a blank string
-func (a Args) First() string {
-	return a.Get(0)
-}
-
-// Tail returns the rest of the arguments (not the first one)
-// or else an empty string slice
-func (a Args) Tail() []string {
-	if len(a) >= 2 {
-		return []string(a)[1:]
-	}
-	return []string{}
-}
-
-// Present checks if there are any arguments present
-func (a Args) Present() bool {
-	return len(a) != 0
-}
-
-// Swap swaps arguments at the given indexes
-func (a Args) Swap(from, to int) error {
-	if from >= len(a) || to >= len(a) {
-		return errors.New("index out of range")
-	}
-	a[from], a[to] = a[to], a[from]
-	return nil
-}
-
-func globalContext(ctx *Context) *Context {
-	if ctx == nil {
-		return nil
-	}
-
-	for {
-		if ctx.parentContext == nil {
-			return ctx
-		}
-		ctx = ctx.parentContext
-	}
-}
-
-func lookupGlobalFlagSet(name string, ctx *Context) *flag.FlagSet {
-	if ctx.parentContext != nil {
-		ctx = ctx.parentContext
-	}
-	for ; ctx != nil; ctx = ctx.parentContext {
-		if f := ctx.flagSet.Lookup(name); f != nil {
-			return ctx.flagSet
-		}
-	}
-	return nil
-}
-
-func copyFlag(name string, ff *flag.Flag, set *flag.FlagSet) {
-	switch ff.Value.(type) {
-	case *StringSlice:
-	default:
-		set.Set(name, ff.Value.String())
-	}
-}
-
-func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
-	visited := make(map[string]bool)
-	set.Visit(func(f *flag.Flag) {
-		visited[f.Name] = true
-	})
-	for _, f := range flags {
-		parts := strings.Split(f.GetName(), ",")
-		if len(parts) == 1 {
-			continue
-		}
-		var ff *flag.Flag
-		for _, name := range parts {
-			name = strings.Trim(name, " ")
-			if visited[name] {
-				if ff != nil {
-					return errors.New("Cannot use two forms of the same flag: " + name + " " + ff.Name)
-				}
-				ff = set.Lookup(name)
-			}
-		}
-		if ff == nil {
-			continue
-		}
-		for _, name := range parts {
-			name = strings.Trim(name, " ")
-			if !visited[name] {
-				copyFlag(name, ff, set)
-			}
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/urfave/cli/flag-types.json b/Godeps/_workspace/src/github.com/urfave/cli/flag-types.json
deleted file mode 100644
index 1223107859a1..000000000000
--- a/Godeps/_workspace/src/github.com/urfave/cli/flag-types.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "name": "Bool",
-    "type": "bool",
-    "value": false,
-    "context_default": "false",
-    "parser": "strconv.ParseBool(f.Value.String())"
-  },
-  {
-    "name": "BoolT",
-    "type": "bool",
-    "value": false,
-    "doctail": " that is true by default",
-    "context_default": "false",
-    "parser": "strconv.ParseBool(f.Value.String())"
-  },
-  {
-    "name": "Duration",
-    "type": "time.Duration",
-    "doctail": " (see https://golang.org/pkg/time/#ParseDuration)",
-    "context_default": "0",
-    "parser": "time.ParseDuration(f.Value.String())"
-  },
-  {
-    "name": "Float64",
-    "type": "float64",
-    "context_default": "0",
-    "parser": "strconv.ParseFloat(f.Value.String(), 64)"
-  },
-  {
-    "name": "Generic",
-    "type": "Generic",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "interface{}"
-  },
-  {
-    "name": "Int64",
-    "type": "int64",
-    "context_default": "0",
-    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)"
-  },
-  {
-    "name": "Int",
-    "type": "int",
-    "context_default": "0",
-    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)",
-    "parser_cast": "int(parsed)"
-  },
-  {
-    "name": "IntSlice",
-    "type": "*IntSlice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]int",
-    "parser": "(f.Value.(*IntSlice)).Value(), error(nil)"
-  },
-  {
-    "name": "Int64Slice",
-    "type": "*Int64Slice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]int64",
-    "parser": "(f.Value.(*Int64Slice)).Value(), error(nil)"
-  },
-  {
-    "name": "String",
-    "type": "string",
-    "context_default": "\"\"",
-    "parser": "f.Value.String(), error(nil)"
-  },
-  {
-    "name": "StringSlice",
-    "type": "*StringSlice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]string",
-    "parser": "(f.Value.(*StringSlice)).Value(), error(nil)"
-  },
-  {
-    "name": "Uint64",
-    "type": "uint64",
-    "context_default": "0",
-    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)"
-  },
-  {
-    "name": "Uint",
-    "type": "uint",
-    "context_default": "0",
-    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)",
-    "parser_cast": "uint(parsed)"
-  }
-]
diff --git a/Godeps/_workspace/src/github.com/urfave/cli/flag_generated.go b/Godeps/_workspace/src/github.com/urfave/cli/flag_generated.go
deleted file mode 100644
index 491b61956c76..000000000000
--- a/Godeps/_workspace/src/github.com/urfave/cli/flag_generated.go
+++ /dev/null
@@ -1,627 +0,0 @@
-package cli
-
-import (
-	"flag"
-	"strconv"
-	"time"
-)
-
-// WARNING: This file is generated!
-
-// BoolFlag is a flag with type bool
-type BoolFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Destination *bool
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f BoolFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f BoolFlag) GetName() string {
-	return f.Name
-}
-
-// Bool looks up the value of a local BoolFlag, returns
-// false if not found
-func (c *Context) Bool(name string) bool {
-	return lookupBool(name, c.flagSet)
-}
-
-// GlobalBool looks up the value of a global BoolFlag, returns
-// false if not found
-func (c *Context) GlobalBool(name string) bool {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupBool(name, fs)
-	}
-	return false
-}
-
-func lookupBool(name string, set *flag.FlagSet) bool {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseBool(f.Value.String())
-		if err != nil {
-			return false
-		}
-		return parsed
-	}
-	return false
-}
-
-// BoolTFlag is a flag with type bool that is true by default
-type BoolTFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Destination *bool
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f BoolTFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f BoolTFlag) GetName() string {
-	return f.Name
-}
-
-// BoolT looks up the value of a local BoolTFlag, returns
-// false if not found
-func (c *Context) BoolT(name string) bool {
-	return lookupBoolT(name, c.flagSet)
-}
-
-// GlobalBoolT looks up the value of a global BoolTFlag, returns
-// false if not found
-func (c *Context) GlobalBoolT(name string) bool {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupBoolT(name, fs)
-	}
-	return false
-}
-
-func lookupBoolT(name string, set *flag.FlagSet) bool {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseBool(f.Value.String())
-		if err != nil {
-			return false
-		}
-		return parsed
-	}
-	return false
-}
-
-// DurationFlag is a flag with type time.Duration (see https://golang.org/pkg/time/#ParseDuration)
-type DurationFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       time.Duration
-	Destination *time.Duration
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f DurationFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f DurationFlag) GetName() string {
-	return f.Name
-}
-
-// Duration looks up the value of a local DurationFlag, returns
-// 0 if not found
-func (c *Context) Duration(name string) time.Duration {
-	return lookupDuration(name, c.flagSet)
-}
-
-// GlobalDuration looks up the value of a global DurationFlag, returns
-// 0 if not found
-func (c *Context) GlobalDuration(name string) time.Duration {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupDuration(name, fs)
-	}
-	return 0
-}
-
-func lookupDuration(name string, set *flag.FlagSet) time.Duration {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := time.ParseDuration(f.Value.String())
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// Float64Flag is a flag with type float64
-type Float64Flag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       float64
-	Destination *float64
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Float64Flag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Float64Flag) GetName() string {
-	return f.Name
-}
-
-// Float64 looks up the value of a local Float64Flag, returns
-// 0 if not found
-func (c *Context) Float64(name string) float64 {
-	return lookupFloat64(name, c.flagSet)
-}
-
-// GlobalFloat64 looks up the value of a global Float64Flag, returns
-// 0 if not found
-func (c *Context) GlobalFloat64(name string) float64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupFloat64(name, fs)
-	}
-	return 0
-}
-
-func lookupFloat64(name string, set *flag.FlagSet) float64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseFloat(f.Value.String(), 64)
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// GenericFlag is a flag with type Generic
-type GenericFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  Generic
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f GenericFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f GenericFlag) GetName() string {
-	return f.Name
-}
-
-// Generic looks up the value of a local GenericFlag, returns
-// nil if not found
-func (c *Context) Generic(name string) interface{} {
-	return lookupGeneric(name, c.flagSet)
-}
-
-// GlobalGeneric looks up the value of a global GenericFlag, returns
-// nil if not found
-func (c *Context) GlobalGeneric(name string) interface{} {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupGeneric(name, fs)
-	}
-	return nil
-}
-
-func lookupGeneric(name string, set *flag.FlagSet) interface{} {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := f.Value, error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// Int64Flag is a flag with type int64
-type Int64Flag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       int64
-	Destination *int64
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Int64Flag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Int64Flag) GetName() string {
-	return f.Name
-}
-
-// Int64 looks up the value of a local Int64Flag, returns
-// 0 if not found
-func (c *Context) Int64(name string) int64 {
-	return lookupInt64(name, c.flagSet)
-}
-
-// GlobalInt64 looks up the value of a global Int64Flag, returns
-// 0 if not found
-func (c *Context) GlobalInt64(name string) int64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupInt64(name, fs)
-	}
-	return 0
-}
-
-func lookupInt64(name string, set *flag.FlagSet) int64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseInt(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// IntFlag is a flag with type int
-type IntFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       int
-	Destination *int
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f IntFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f IntFlag) GetName() string {
-	return f.Name
-}
-
-// Int looks up the value of a local IntFlag, returns
-// 0 if not found
-func (c *Context) Int(name string) int {
-	return lookupInt(name, c.flagSet)
-}
-
-// GlobalInt looks up the value of a global IntFlag, returns
-// 0 if not found
-func (c *Context) GlobalInt(name string) int {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupInt(name, fs)
-	}
-	return 0
-}
-
-func lookupInt(name string, set *flag.FlagSet) int {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseInt(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return int(parsed)
-	}
-	return 0
-}
-
-// IntSliceFlag is a flag with type *IntSlice
-type IntSliceFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  *IntSlice
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f IntSliceFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f IntSliceFlag) GetName() string {
-	return f.Name
-}
-
-// IntSlice looks up the value of a local IntSliceFlag, returns
-// nil if not found
-func (c *Context) IntSlice(name string) []int {
-	return lookupIntSlice(name, c.flagSet)
-}
-
-// GlobalIntSlice looks up the value of a global IntSliceFlag, returns
-// nil if not found
-func (c *Context) GlobalIntSlice(name string) []int {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupIntSlice(name, fs)
-	}
-	return nil
-}
-
-func lookupIntSlice(name string, set *flag.FlagSet) []int {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := (f.Value.(*IntSlice)).Value(), error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// Int64SliceFlag is a flag with type *Int64Slice
-type Int64SliceFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  *Int64Slice
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Int64SliceFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Int64SliceFlag) GetName() string {
-	return f.Name
-}
-
-// Int64Slice looks up the value of a local Int64SliceFlag, returns
-// nil if not found
-func (c *Context) Int64Slice(name string) []int64 {
-	return lookupInt64Slice(name, c.flagSet)
-}
-
-// GlobalInt64Slice looks up the value of a global Int64SliceFlag, returns
-// nil if not found
-func (c *Context) GlobalInt64Slice(name string) []int64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupInt64Slice(name, fs)
-	}
-	return nil
-}
-
-func lookupInt64Slice(name string, set *flag.FlagSet) []int64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := (f.Value.(*Int64Slice)).Value(), error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// StringFlag is a flag with type string
-type StringFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       string
-	Destination *string
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f StringFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f StringFlag) GetName() string {
-	return f.Name
-}
-
-// String looks up the value of a local StringFlag, returns
-// "" if not found
-func (c *Context) String(name string) string {
-	return lookupString(name, c.flagSet)
-}
-
-// GlobalString looks up the value of a global StringFlag, returns
-// "" if not found
-func (c *Context) GlobalString(name string) string {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupString(name, fs)
-	}
-	return ""
-}
-
-func lookupString(name string, set *flag.FlagSet) string {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := f.Value.String(), error(nil)
-		if err != nil {
-			return ""
-		}
-		return parsed
-	}
-	return ""
-}
-
-// StringSliceFlag is a flag with type *StringSlice
-type StringSliceFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  *StringSlice
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f StringSliceFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f StringSliceFlag) GetName() string {
-	return f.Name
-}
-
-// StringSlice looks up the value of a local StringSliceFlag, returns
-// nil if not found
-func (c *Context) StringSlice(name string) []string {
-	return lookupStringSlice(name, c.flagSet)
-}
-
-// GlobalStringSlice looks up the value of a global StringSliceFlag, returns
-// nil if not found
-func (c *Context) GlobalStringSlice(name string) []string {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupStringSlice(name, fs)
-	}
-	return nil
-}
-
-func lookupStringSlice(name string, set *flag.FlagSet) []string {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := (f.Value.(*StringSlice)).Value(), error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// Uint64Flag is a flag with type uint64
-type Uint64Flag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       uint64
-	Destination *uint64
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Uint64Flag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Uint64Flag) GetName() string {
-	return f.Name
-}
-
-// Uint64 looks up the value of a local Uint64Flag, returns
-// 0 if not found
-func (c *Context) Uint64(name string) uint64 {
-	return lookupUint64(name, c.flagSet)
-}
-
-// GlobalUint64 looks up the value of a global Uint64Flag, returns
-// 0 if not found
-func (c *Context) GlobalUint64(name string) uint64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupUint64(name, fs)
-	}
-	return 0
-}
-
-func lookupUint64(name string, set *flag.FlagSet) uint64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseUint(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// UintFlag is a flag with type uint
-type UintFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       uint
-	Destination *uint
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f UintFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f UintFlag) GetName() string {
-	return f.Name
-}
-
-// Uint looks up the value of a local UintFlag, returns
-// 0 if not found
-func (c *Context) Uint(name string) uint {
-	return lookupUint(name, c.flagSet)
-}
-
-// GlobalUint looks up the value of a global UintFlag, returns
-// 0 if not found
-func (c *Context) GlobalUint(name string) uint {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupUint(name, fs)
-	}
-	return 0
-}
-
-func lookupUint(name string, set *flag.FlagSet) uint {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseUint(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return uint(parsed)
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/urfave/cli/generate-flag-types b/Godeps/_workspace/src/github.com/urfave/cli/generate-flag-types
deleted file mode 100755
index 7147381ce373..000000000000
--- a/Godeps/_workspace/src/github.com/urfave/cli/generate-flag-types
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/usr/bin/env python
-"""
-The flag types that ship with the cli library have many things in common, and
-so we can take advantage of the `go generate` command to create much of the
-source code from a list of definitions.  These definitions attempt to cover
-the parts that vary between flag types, and should evolve as needed.
-
-An example of the minimum definition needed is:
-
-    {
-      "name": "SomeType",
-      "type": "sometype",
-      "context_default": "nil"
-    }
-
-In this example, the code generated for the `cli` package will include a type
-named `SomeTypeFlag` that is expected to wrap a value of type `sometype`.
-Fetching values by name via `*cli.Context` will default to a value of `nil`.
-
-A more complete, albeit somewhat redundant, example showing all available
-definition keys is:
-
-    {
-      "name": "VeryMuchType",
-      "type": "*VeryMuchType",
-      "value": true,
-      "dest": false,
-      "doctail": " which really only wraps a []float64, oh well!",
-      "context_type": "[]float64",
-      "context_default": "nil",
-      "parser": "parseVeryMuchType(f.Value.String())",
-      "parser_cast": "[]float64(parsed)"
-    }
-
-The meaning of each field is as follows:
-
-               name (string) - The type "name", which will be suffixed with
-                               `Flag` when generating the type definition
-                               for `cli` and the wrapper type for `altsrc`
-               type (string) - The type that the generated `Flag` type for `cli`
-                               is expected to "contain" as its `.Value` member
-                value (bool) - Should the generated `cli` type have a `Value`
-                               member?
-                 dest (bool) - Should the generated `cli` type support a
-                               destination pointer?
-            doctail (string) - Additional docs for the `cli` flag type comment
-       context_type (string) - The literal type used in the `*cli.Context`
-                               reader func signature
-    context_default (string) - The literal value used as the default by the
-                               `*cli.Context` reader funcs when no value is
-                               present
-             parser (string) - Literal code used to parse the flag `f`,
-                               expected to have a return signature of
-                               (value, error)
-        parser_cast (string) - Literal code used to cast the `parsed` value
-                               returned from the `parser` code
-"""
-
-from __future__ import print_function, unicode_literals
-
-import argparse
-import json
-import os
-import subprocess
-import sys
-import tempfile
-import textwrap
-
-
-class _FancyFormatter(argparse.ArgumentDefaultsHelpFormatter,
-                      argparse.RawDescriptionHelpFormatter):
-    pass
-
-
-def main(sysargs=sys.argv[:]):
-    parser = argparse.ArgumentParser(
-        description='Generate flag type code!',
-        formatter_class=_FancyFormatter)
-    parser.add_argument(
-        'package',
-        type=str, default='cli', choices=_WRITEFUNCS.keys(),
-        help='Package for which flag types will be generated'
-    )
-    parser.add_argument(
-        '-i', '--in-json',
-        type=argparse.FileType('r'),
-        default=sys.stdin,
-        help='Input JSON file which defines each type to be generated'
-    )
-    parser.add_argument(
-        '-o', '--out-go',
-        type=argparse.FileType('w'),
-        default=sys.stdout,
-        help='Output file/stream to which generated source will be written'
-    )
-    parser.epilog = __doc__
-
-    args = parser.parse_args(sysargs[1:])
-    _generate_flag_types(_WRITEFUNCS[args.package], args.out_go, args.in_json)
-    return 0
-
-
-def _generate_flag_types(writefunc, output_go, input_json):
-    types = json.load(input_json)
-
-    tmp = tempfile.NamedTemporaryFile(suffix='.go', delete=False)
-    writefunc(tmp, types)
-    tmp.close()
-
-    new_content = subprocess.check_output(
-        ['goimports', tmp.name]
-    ).decode('utf-8')
-
-    print(new_content, file=output_go, end='')
-    output_go.flush()
-    os.remove(tmp.name)
-
-
-def _set_typedef_defaults(typedef):
-    typedef.setdefault('doctail', '')
-    typedef.setdefault('context_type', typedef['type'])
-    typedef.setdefault('dest', True)
-    typedef.setdefault('value', True)
-    typedef.setdefault('parser', 'f.Value, error(nil)')
-    typedef.setdefault('parser_cast', 'parsed')
-
-
-def _write_cli_flag_types(outfile, types):
-    _fwrite(outfile, """\
-        package cli
-
-        // WARNING: This file is generated!
-
-        """)
-
-    for typedef in types:
-        _set_typedef_defaults(typedef)
-
-        _fwrite(outfile, """\
-        // {name}Flag is a flag with type {type}{doctail}
-        type {name}Flag struct {{
-            Name string
-            Usage string
-            EnvVar string
-            Hidden bool
-        """.format(**typedef))
-
-        if typedef['value']:
-            _fwrite(outfile, """\
-            Value {type}
-            """.format(**typedef))
-
-        if typedef['dest']:
-            _fwrite(outfile, """\
-            Destination *{type}
-            """.format(**typedef))
-
-        _fwrite(outfile, "\n}\n\n")
-
-        _fwrite(outfile, """\
-            // String returns a readable representation of this value
-            // (for usage defaults)
-            func (f {name}Flag) String() string {{
-                return FlagStringer(f)
-            }}
-
-            // GetName returns the name of the flag
-            func (f {name}Flag) GetName() string {{
-                return f.Name
-            }}
-
-            // {name} looks up the value of a local {name}Flag, returns
-            // {context_default} if not found
-            func (c *Context) {name}(name string) {context_type} {{
-                return lookup{name}(name, c.flagSet)
-            }}
-
-            // Global{name} looks up the value of a global {name}Flag, returns
-            // {context_default} if not found
-            func (c *Context) Global{name}(name string) {context_type} {{
-                if fs := lookupGlobalFlagSet(name, c); fs != nil {{
-                    return lookup{name}(name, fs)
-                }}
-                return {context_default}
-            }}
-
-            func lookup{name}(name string, set *flag.FlagSet) {context_type} {{
-                f := set.Lookup(name)
-                if f != nil {{
-                    parsed, err := {parser}
-                    if err != nil {{
-                        return {context_default}
-                    }}
-                    return {parser_cast}
-                }}
-                return {context_default}
-            }}
-            """.format(**typedef))
-
-
-def _write_altsrc_flag_types(outfile, types):
-    _fwrite(outfile, """\
-        package altsrc
-
-        import (
-            "gopkg.in/urfave/cli.v1"
-        )
-
-        // WARNING: This file is generated!
-
-        """)
-
-    for typedef in types:
-        _set_typedef_defaults(typedef)
-
-        _fwrite(outfile, """\
-        // {name}Flag is the flag type that wraps cli.{name}Flag to allow
-        // for other values to be specified
-        type {name}Flag struct {{
-            cli.{name}Flag
-            set *flag.FlagSet
-        }}
-
-        // New{name}Flag creates a new {name}Flag
-        func New{name}Flag(fl cli.{name}Flag) *{name}Flag {{
-            return &{name}Flag{{{name}Flag: fl, set: nil}}
-        }}
-
-        // Apply saves the flagSet for later usage calls, then calls the
-        // wrapped {name}Flag.Apply
-        func (f *{name}Flag) Apply(set *flag.FlagSet) {{
-            f.set = set
-            f.{name}Flag.Apply(set)
-        }}
-
-        // ApplyWithError saves the flagSet for later usage calls, then calls the
-        // wrapped {name}Flag.ApplyWithError
-        func (f *{name}Flag) ApplyWithError(set *flag.FlagSet) error {{
-            f.set = set
-            return f.{name}Flag.ApplyWithError(set)
-        }}
-        """.format(**typedef))
-
-
-def _fwrite(outfile, text):
-    print(textwrap.dedent(text), end='', file=outfile)
-
-
-_WRITEFUNCS = {
-    'cli': _write_cli_flag_types,
-    'altsrc': _write_altsrc_flag_types
-}
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
index 60c42a910709..9e70b6629f71 100644
--- a/cmd/runtimetest/main.go
+++ b/cmd/runtimetest/main.go
@@ -418,8 +418,8 @@ func validateOOMScoreAdj(spec *rspec.Spec) error {
 	return nil
 }
 
-func getIDMappings(path string) ([]rspec.IDMapping, error) {
-	var idMaps []rspec.IDMapping
+func getIDMappings(path string) ([]rspec.LinuxIDMapping, error) {
+	var idMaps []rspec.LinuxIDMapping
 	f, err := os.Open(path)
 	if err != nil {
 		return nil, err
@@ -446,7 +446,7 @@ func getIDMappings(path string) ([]rspec.IDMapping, error) {
 			if err != nil {
 				return nil, err
 			}
-			idMaps = append(idMaps, rspec.IDMapping{HostID: uint32(hostID), ContainerID: uint32(containerID), Size: uint32(mapSize)})
+			idMaps = append(idMaps, rspec.LinuxIDMapping{HostID: uint32(hostID), ContainerID: uint32(containerID), Size: uint32(mapSize)})
 		} else {
 			return nil, fmt.Errorf("invalid format in %v", path)
 		}
@@ -455,7 +455,7 @@ func getIDMappings(path string) ([]rspec.IDMapping, error) {
 	return idMaps, nil
 }
 
-func validateIDMappings(mappings []rspec.IDMapping, path string, property string) error {
+func validateIDMappings(mappings []rspec.LinuxIDMapping, path string, property string) error {
 	idMaps, err := getIDMappings(path)
 	if err != nil {
 		return fmt.Errorf("can not get items: %v", err)
diff --git a/generate/generate.go b/generate/generate.go
index e8c364162ee2..b28f8342b0d2 100644
--- a/generate/generate.go
+++ b/generate/generate.go
@@ -69,7 +69,7 @@ func New() Generator {
 				"CAP_KILL",
 				"CAP_AUDIT_WRITE",
 			},
-			Rlimits: []rspec.Rlimit{
+			Rlimits: []rspec.LinuxRlimit{
 				{
 					Type: "RLIMIT_NOFILE",
 					Hard: uint64(1024),
@@ -117,15 +117,15 @@ func New() Generator {
 			},
 		},
 		Linux: &rspec.Linux{
-			Resources: &rspec.Resources{
-				Devices: []rspec.DeviceCgroup{
+			Resources: &rspec.LinuxResources{
+				Devices: []rspec.LinuxDeviceCgroup{
 					{
 						Allow:  false,
 						Access: strPtr("rwm"),
 					},
 				},
 			},
-			Namespaces: []rspec.Namespace{
+			Namespaces: []rspec.LinuxNamespace{
 				{
 					Type: "pid",
 				},
@@ -142,7 +142,7 @@ func New() Generator {
 					Type: "mount",
 				},
 			},
-			Devices: []rspec.Device{},
+			Devices: []rspec.LinuxDevice{},
 		},
 	}
 	spec.Linux.Seccomp = seccomp.DefaultProfile(&spec)
@@ -348,7 +348,7 @@ func (g *Generator) AddProcessRlimits(rType string, rHard uint64, rSoft uint64)
 		}
 	}
 
-	newRlimit := rspec.Rlimit{
+	newRlimit := rspec.LinuxRlimit{
 		Type: rType,
 		Hard: rHard,
 		Soft: rSoft,
@@ -375,7 +375,7 @@ func (g *Generator) ClearProcessRlimits() {
 	if g.spec == nil {
 		return
 	}
-	g.spec.Process.Rlimits = []rspec.Rlimit{}
+	g.spec.Process.Rlimits = []rspec.LinuxRlimit{}
 }
 
 // ClearProcessAdditionalGids clear g.spec.Process.AdditionalGids.
@@ -520,7 +520,7 @@ func (g *Generator) AddLinuxResourcesNetworkPriorities(name string, prio uint32)
 			return
 		}
 	}
-	interfacePrio := new(rspec.InterfacePriority)
+	interfacePrio := new(rspec.LinuxInterfacePriority)
 	interfacePrio.Name = name
 	interfacePrio.Priority = prio
 	g.spec.Linux.Resources.Network.Priorities = append(g.spec.Linux.Resources.Network.Priorities, *interfacePrio)
@@ -540,7 +540,7 @@ func (g *Generator) DropLinuxResourcesNetworkPriorities(name string) {
 // SetLinuxResourcesPidsLimit sets g.spec.Linux.Resources.Pids.Limit.
 func (g *Generator) SetLinuxResourcesPidsLimit(limit int64) {
 	g.initSpecLinuxResourcesPids()
-	g.spec.Linux.Resources.Pids.Limit = &limit
+	g.spec.Linux.Resources.Pids.Limit = limit
 }
 
 // ClearLinuxSysctl clears g.spec.Linux.Sysctl.
@@ -570,12 +570,12 @@ func (g *Generator) ClearLinuxUIDMappings() {
 	if g.spec == nil || g.spec.Linux == nil {
 		return
 	}
-	g.spec.Linux.UIDMappings = []rspec.IDMapping{}
+	g.spec.Linux.UIDMappings = []rspec.LinuxIDMapping{}
 }
 
 // AddLinuxUIDMapping adds uidMap into g.spec.Linux.UIDMappings.
 func (g *Generator) AddLinuxUIDMapping(hid, cid, size uint32) {
-	idMapping := rspec.IDMapping{
+	idMapping := rspec.LinuxIDMapping{
 		HostID:      hid,
 		ContainerID: cid,
 		Size:        size,
@@ -590,12 +590,12 @@ func (g *Generator) ClearLinuxGIDMappings() {
 	if g.spec == nil || g.spec.Linux == nil {
 		return
 	}
-	g.spec.Linux.GIDMappings = []rspec.IDMapping{}
+	g.spec.Linux.GIDMappings = []rspec.LinuxIDMapping{}
 }
 
 // AddLinuxGIDMapping adds gidMap into g.spec.Linux.GIDMappings.
 func (g *Generator) AddLinuxGIDMapping(hid, cid, size uint32) {
-	idMapping := rspec.IDMapping{
+	idMapping := rspec.LinuxIDMapping{
 		HostID:      hid,
 		ContainerID: cid,
 		Size:        size,
@@ -829,24 +829,24 @@ func (g *Generator) DropProcessCapability(c string) error {
 	return nil
 }
 
-func mapStrToNamespace(ns string, path string) (rspec.Namespace, error) {
+func mapStrToNamespace(ns string, path string) (rspec.LinuxNamespace, error) {
 	switch ns {
 	case "network":
-		return rspec.Namespace{Type: rspec.NetworkNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.NetworkNamespace, Path: path}, nil
 	case "pid":
-		return rspec.Namespace{Type: rspec.PIDNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.PIDNamespace, Path: path}, nil
 	case "mount":
-		return rspec.Namespace{Type: rspec.MountNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.MountNamespace, Path: path}, nil
 	case "ipc":
-		return rspec.Namespace{Type: rspec.IPCNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.IPCNamespace, Path: path}, nil
 	case "uts":
-		return rspec.Namespace{Type: rspec.UTSNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.UTSNamespace, Path: path}, nil
 	case "user":
-		return rspec.Namespace{Type: rspec.UserNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.UserNamespace, Path: path}, nil
 	case "cgroup":
-		return rspec.Namespace{Type: rspec.CgroupNamespace, Path: path}, nil
+		return rspec.LinuxNamespace{Type: rspec.CgroupNamespace, Path: path}, nil
 	default:
-		return rspec.Namespace{}, fmt.Errorf("Should not reach here!")
+		return rspec.LinuxNamespace{}, fmt.Errorf("Should not reach here!")
 	}
 }
 
@@ -855,7 +855,7 @@ func (g *Generator) ClearLinuxNamespaces() {
 	if g.spec == nil || g.spec.Linux == nil {
 		return
 	}
-	g.spec.Linux.Namespaces = []rspec.Namespace{}
+	g.spec.Linux.Namespaces = []rspec.LinuxNamespace{}
 }
 
 // AddOrReplaceLinuxNamespace adds or replaces a namespace inside
diff --git a/generate/seccomp/parse_action.go b/generate/seccomp/parse_action.go
index 13cace24f0eb..35179c4c89d9 100644
--- a/generate/seccomp/parse_action.go
+++ b/generate/seccomp/parse_action.go
@@ -20,7 +20,7 @@ type SyscallOpts struct {
 
 // ParseSyscallFlag takes a SyscallOpts struct and the seccomp configuration
 // and sets the new syscall rule accordingly
-func ParseSyscallFlag(args SyscallOpts, config *rspec.Seccomp) error {
+func ParseSyscallFlag(args SyscallOpts, config *rspec.LinuxSeccomp) error {
 	var arguments []string
 	if args.Index != "" && args.Value != "" && args.ValueTwo != "" && args.Operator != "" {
 		arguments = []string{args.Action, args.Syscall, args.Index, args.Value,
@@ -34,7 +34,7 @@ func ParseSyscallFlag(args SyscallOpts, config *rspec.Seccomp) error {
 		return fmt.Errorf("default action already set as %s", action)
 	}
 
-	var newSyscall rspec.Syscall
+	var newSyscall rspec.LinuxSyscall
 	numOfArgs := len(arguments)
 	if numOfArgs == 6 || numOfArgs == 2 {
 		argStruct, err := parseArguments(arguments[1:])
@@ -67,7 +67,7 @@ func ParseSyscallFlag(args SyscallOpts, config *rspec.Seccomp) error {
 	return nil
 }
 
-var actions = map[string]rspec.Action{
+var actions = map[string]rspec.LinuxSeccompAction{
 	"allow": rspec.ActAllow,
 	"errno": rspec.ActErrno,
 	"kill":  rspec.ActKill,
@@ -76,7 +76,7 @@ var actions = map[string]rspec.Action{
 }
 
 // Take passed action, return the SCMP_ACT_<ACTION> version of it
-func parseAction(action string) (rspec.Action, error) {
+func parseAction(action string) (rspec.LinuxSeccompAction, error) {
 	a, ok := actions[action]
 	if !ok {
 		return "", fmt.Errorf("unrecognized action: %s", action)
@@ -86,7 +86,7 @@ func parseAction(action string) (rspec.Action, error) {
 
 // ParseDefaultAction sets the default action of the seccomp configuration
 // and then removes any rules that were already specified with this action
-func ParseDefaultAction(action string, config *rspec.Seccomp) error {
+func ParseDefaultAction(action string, config *rspec.LinuxSeccomp) error {
 	if action == "" {
 		return nil
 	}
@@ -104,7 +104,7 @@ func ParseDefaultAction(action string, config *rspec.Seccomp) error {
 }
 
 // ParseDefaultActionForce simply sets the default action of the seccomp configuration
-func ParseDefaultActionForce(action string, config *rspec.Seccomp) error {
+func ParseDefaultActionForce(action string, config *rspec.LinuxSeccomp) error {
 	if action == "" {
 		return nil
 	}
@@ -117,8 +117,8 @@ func ParseDefaultActionForce(action string, config *rspec.Seccomp) error {
 	return nil
 }
 
-func newSyscallStruct(name string, action rspec.Action, args []rspec.Arg) rspec.Syscall {
-	syscallStruct := rspec.Syscall{
+func newSyscallStruct(name string, action rspec.LinuxSeccompAction, args []rspec.LinuxSeccompArg) rspec.LinuxSyscall {
+	syscallStruct := rspec.LinuxSyscall{
 		Name:   name,
 		Action: action,
 		Args:   args,
diff --git a/generate/seccomp/parse_architecture.go b/generate/seccomp/parse_architecture.go
index 9d45fabc6b47..fc482445efb7 100644
--- a/generate/seccomp/parse_architecture.go
+++ b/generate/seccomp/parse_architecture.go
@@ -8,7 +8,7 @@ import (
 
 // ParseArchitectureFlag takes the raw string passed with the --arch flag, parses it
 // and updates the Seccomp config accordingly
-func ParseArchitectureFlag(architectureArg string, config *rspec.Seccomp) error {
+func ParseArchitectureFlag(architectureArg string, config *rspec.LinuxSeccomp) error {
 	correctedArch, err := parseArch(architectureArg)
 	if err != nil {
 		return err
diff --git a/generate/seccomp/parse_arguments.go b/generate/seccomp/parse_arguments.go
index 72f0b13d8ee8..2b4c394e679e 100644
--- a/generate/seccomp/parse_arguments.go
+++ b/generate/seccomp/parse_arguments.go
@@ -9,8 +9,8 @@ import (
 
 // parseArguments takes a list of arguments (delimArgs). It parses and fills out
 // the argument information and returns a slice of arg structs
-func parseArguments(delimArgs []string) ([]rspec.Arg, error) {
-	nilArgSlice := []rspec.Arg{}
+func parseArguments(delimArgs []string) ([]rspec.LinuxSeccompArg, error) {
+	nilArgSlice := []rspec.LinuxSeccompArg{}
 	numberOfArgs := len(delimArgs)
 
 	// No parameters passed with syscall
@@ -40,14 +40,14 @@ func parseArguments(delimArgs []string) ([]rspec.Arg, error) {
 			return nilArgSlice, err
 		}
 
-		argStruct := rspec.Arg{
+		argStruct := rspec.LinuxSeccompArg{
 			Index:    uint(syscallIndex),
 			Value:    syscallValue,
 			ValueTwo: syscallValueTwo,
 			Op:       syscallOp,
 		}
 
-		argSlice := []rspec.Arg{}
+		argSlice := []rspec.LinuxSeccompArg{}
 		argSlice = append(argSlice, argStruct)
 		return argSlice, nil
 	}
@@ -55,8 +55,8 @@ func parseArguments(delimArgs []string) ([]rspec.Arg, error) {
 	return nilArgSlice, fmt.Errorf("incorrect number of arguments passed with syscall: %d", numberOfArgs)
 }
 
-func parseOperator(operator string) (rspec.Operator, error) {
-	operators := map[string]rspec.Operator{
+func parseOperator(operator string) (rspec.LinuxSeccompOperator, error) {
+	operators := map[string]rspec.LinuxSeccompOperator{
 		"NE": rspec.OpNotEqual,
 		"LT": rspec.OpLessThan,
 		"LE": rspec.OpLessEqual,
diff --git a/generate/seccomp/parse_remove.go b/generate/seccomp/parse_remove.go
index ce68e66d004b..1d39cdee2ce3 100644
--- a/generate/seccomp/parse_remove.go
+++ b/generate/seccomp/parse_remove.go
@@ -10,7 +10,7 @@ import (
 
 // RemoveAction takes the argument string that was passed with the --remove flag,
 // parses it, and updates the Seccomp config accordingly
-func RemoveAction(arguments string, config *rspec.Seccomp) error {
+func RemoveAction(arguments string, config *rspec.LinuxSeccomp) error {
 	if config == nil {
 		return fmt.Errorf("Cannot remove action from nil Seccomp pointer")
 	}
@@ -33,17 +33,17 @@ func RemoveAction(arguments string, config *rspec.Seccomp) error {
 }
 
 // RemoveAllSeccompRules removes all seccomp syscall rules
-func RemoveAllSeccompRules(config *rspec.Seccomp) error {
+func RemoveAllSeccompRules(config *rspec.LinuxSeccomp) error {
 	if config == nil {
 		return fmt.Errorf("Cannot remove action from nil Seccomp pointer")
 	}
-	newSyscallSlice := []rspec.Syscall{}
+	newSyscallSlice := []rspec.LinuxSyscall{}
 	config.Syscalls = newSyscallSlice
 	return nil
 }
 
 // RemoveAllMatchingRules will remove any syscall rules that match the specified action
-func RemoveAllMatchingRules(config *rspec.Seccomp, action string) error {
+func RemoveAllMatchingRules(config *rspec.LinuxSeccomp, action string) error {
 	if config == nil {
 		return fmt.Errorf("Cannot remove action from nil Seccomp pointer")
 	}
diff --git a/generate/seccomp/seccomp_default.go b/generate/seccomp/seccomp_default.go
index 2e1d46870675..d79323714948 100644
--- a/generate/seccomp/seccomp_default.go
+++ b/generate/seccomp/seccomp_default.go
@@ -32,829 +32,829 @@ func arches() []rspec.Arch {
 }
 
 // DefaultProfile defines the whitelist for the default seccomp profile.
-func DefaultProfile(rs *specs.Spec) *rspec.Seccomp {
+func DefaultProfile(rs *specs.Spec) *rspec.LinuxSeccomp {
 
-	syscalls := []rspec.Syscall{
+	syscalls := []rspec.LinuxSyscall{
 		{
 			Name:   "accept",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "accept4",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "access",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "alarm",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "bind",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "brk",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "capget",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "capset",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "chdir",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "chmod",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "chown",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "chown32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 
 		{
 			Name:   "clock_getres",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "clock_gettime",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "clock_nanosleep",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "close",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "connect",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "copy_file_range",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "creat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "dup",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "dup2",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "dup3",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_create",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_create1",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_ctl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_ctl_old",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_pwait",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_wait",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "epoll_wait_old",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "eventfd",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "eventfd2",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "execve",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "execveat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "exit",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "exit_group",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "faccessat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fadvise64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fadvise64_64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fallocate",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fanotify_mark",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fchdir",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fchmod",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fchmodat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fchown",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fchown32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fchownat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fcntl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fcntl64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fdatasync",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fgetxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "flistxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "flock",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fork",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fremovexattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fsetxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fstat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fstat64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fstatat64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fstatfs",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fstatfs64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "fsync",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ftruncate",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ftruncate64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "futex",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "futimesat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getcpu",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getcwd",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getdents",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getdents64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getegid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getegid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "geteuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "geteuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getgid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getgroups",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getgroups32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getitimer",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getpeername",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getpgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getpgrp",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getpid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getppid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getpriority",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getrandom",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getresgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getresgid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getresuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getresuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getrlimit",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "get_robust_list",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getrusage",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getsid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getsockname",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getsockopt",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "get_thread_area",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "gettid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "gettimeofday",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "getxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "inotify_add_watch",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "inotify_init",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "inotify_init1",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "inotify_rm_watch",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "io_cancel",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ioctl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "io_destroy",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "io_getevents",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ioprio_get",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ioprio_set",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "io_setup",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "io_submit",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ipc",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "kill",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lchown",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lchown32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lgetxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "link",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "linkat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "listen",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "listxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "llistxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "_llseek",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lremovexattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lseek",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lsetxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lstat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "lstat64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "madvise",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "memfd_create",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mincore",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mkdir",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mkdirat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mknod",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mknodat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mlock",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mlock2",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mlockall",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mmap",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mmap2",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mprotect",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mq_getsetattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mq_notify",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mq_open",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mq_timedreceive",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mq_timedsend",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mq_unlink",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "mremap",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "msgctl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "msgget",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "msgrcv",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "msgsnd",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "msync",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "munlock",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "munlockall",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "munmap",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "nanosleep",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "newfstatat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "_newselect",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "open",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "openat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "pause",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "personality",
 			Action: rspec.ActAllow,
-			Args: []rspec.Arg{
+			Args: []rspec.LinuxSeccompArg{
 				{
 					Index: 0,
 					Value: 0x0,
@@ -865,7 +865,7 @@ func DefaultProfile(rs *specs.Spec) *rspec.Seccomp {
 		{
 			Name:   "personality",
 			Action: rspec.ActAllow,
-			Args: []rspec.Arg{
+			Args: []rspec.LinuxSeccompArg{
 				{
 					Index: 0,
 					Value: 0x0008,
@@ -876,7 +876,7 @@ func DefaultProfile(rs *specs.Spec) *rspec.Seccomp {
 		{
 			Name:   "personality",
 			Action: rspec.ActAllow,
-			Args: []rspec.Arg{
+			Args: []rspec.LinuxSeccompArg{
 				{
 					Index: 0,
 					Value: 0xffffffff,
@@ -887,707 +887,707 @@ func DefaultProfile(rs *specs.Spec) *rspec.Seccomp {
 		{
 			Name:   "pipe",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "pipe2",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "poll",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ppoll",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "prctl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "pread64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "preadv",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "prlimit64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "pselect6",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "pwrite64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "pwritev",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "read",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "readahead",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "readlink",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "readlinkat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "readv",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "recv",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "recvfrom",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "recvmmsg",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "recvmsg",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "remap_file_pages",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "removexattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rename",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "renameat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "renameat2",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "restart_syscall",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rmdir",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigaction",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigpending",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigprocmask",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigqueueinfo",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigreturn",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigsuspend",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_sigtimedwait",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "rt_tgsigqueueinfo",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_getaffinity",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_getattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_getparam",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_get_priority_max",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_get_priority_min",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_getscheduler",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_rr_get_interval",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_setaffinity",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_setattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_setparam",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_setscheduler",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sched_yield",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "seccomp",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "select",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "semctl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "semget",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "semop",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "semtimedop",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "send",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sendfile",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sendfile64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sendmmsg",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sendmsg",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sendto",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setfsgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setfsgid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setfsuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setfsuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setgid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setgroups",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setgroups32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setitimer",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setpgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setpriority",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setregid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setregid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setresgid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setresgid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setresuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setresuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setreuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setreuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setrlimit",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "set_robust_list",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setsid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setsockopt",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "set_thread_area",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "set_tid_address",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setuid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setuid32",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "setxattr",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "shmat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "shmctl",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "shmdt",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "shmget",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "shutdown",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sigaltstack",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "signalfd",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "signalfd4",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sigreturn",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "socket",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "socketcall",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "socketpair",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "splice",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "stat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "stat64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "statfs",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "statfs64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "symlink",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "symlinkat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sync",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sync_file_range",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "syncfs",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "sysinfo",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "syslog",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "tee",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "tgkill",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "time",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timer_create",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timer_delete",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timerfd_create",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timerfd_gettime",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timerfd_settime",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timer_getoverrun",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timer_gettime",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "timer_settime",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "times",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "tkill",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "truncate",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "truncate64",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "ugetrlimit",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "umask",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "uname",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "unlink",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "unlinkat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "utime",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "utimensat",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "utimes",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "vfork",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "vmsplice",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "wait4",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "waitid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "waitpid",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "write",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 		{
 			Name:   "writev",
 			Action: rspec.ActAllow,
-			Args:   []rspec.Arg{},
+			Args:   []rspec.LinuxSeccompArg{},
 		},
 	}
 	var sysCloneFlagsIndex uint
@@ -1598,200 +1598,200 @@ func DefaultProfile(rs *specs.Spec) *rspec.Seccomp {
 	for _, cap = range rs.Process.Capabilities {
 		switch cap {
 		case "CAP_DAC_READ_SEARCH":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "open_by_handle_at",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_ADMIN":
 			capSysAdmin = true
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "bpf",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "clone",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "fanotify_init",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "lookup_dcookie",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "mount",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "name_to_handle_at",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "perf_event_open",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "setdomainname",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "sethostname",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "setns",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "umount",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "umount2",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "unshare",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_BOOT":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "reboot",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_CHROOT":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "chroot",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_MODULE":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "delete_module",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "init_module",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "finit_module",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "query_module",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_PACCT":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "acct",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_PTRACE":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "kcmp",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "process_vm_readv",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "process_vm_writev",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "ptrace",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_RAWIO":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "iopl",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "ioperm",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_TIME":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "settimeofday",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "stime",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 				{
 					Name:   "adjtimex",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		case "CAP_SYS_TTY_CONFIG":
-			syscalls = append(syscalls, []rspec.Syscall{
+			syscalls = append(syscalls, []rspec.LinuxSyscall{
 				{
 					Name:   "vhangup",
 					Action: rspec.ActAllow,
-					Args:   []rspec.Arg{},
+					Args:   []rspec.LinuxSeccompArg{},
 				},
 			}...)
 		}
 	}
 
 	if !capSysAdmin {
-		syscalls = append(syscalls, []rspec.Syscall{
+		syscalls = append(syscalls, []rspec.LinuxSyscall{
 			{
 				Name:   "clone",
 				Action: rspec.ActAllow,
-				Args: []rspec.Arg{
+				Args: []rspec.LinuxSeccompArg{
 					{
 						Index:    sysCloneFlagsIndex,
 						Value:    syscall.CLONE_NEWNS | syscall.CLONE_NEWUTS | syscall.CLONE_NEWIPC | syscall.CLONE_NEWUSER | syscall.CLONE_NEWPID | syscall.CLONE_NEWNET,
@@ -1807,62 +1807,62 @@ func DefaultProfile(rs *specs.Spec) *rspec.Seccomp {
 	arch := runtime.GOARCH
 	switch arch {
 	case "arm", "arm64":
-		syscalls = append(syscalls, []rspec.Syscall{
+		syscalls = append(syscalls, []rspec.LinuxSyscall{
 			{
 				Name:   "breakpoint",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 			{
 				Name:   "cacheflush",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 			{
 				Name:   "set_tls",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 		}...)
 	case "amd64", "x32":
-		syscalls = append(syscalls, []rspec.Syscall{
+		syscalls = append(syscalls, []rspec.LinuxSyscall{
 			{
 				Name:   "arch_prctl",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 		}...)
 		fallthrough
 	case "x86":
-		syscalls = append(syscalls, []rspec.Syscall{
+		syscalls = append(syscalls, []rspec.LinuxSyscall{
 			{
 				Name:   "modify_ldt",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 		}...)
 	case "s390", "s390x":
-		syscalls = append(syscalls, []rspec.Syscall{
+		syscalls = append(syscalls, []rspec.LinuxSyscall{
 			{
 				Name:   "s390_pci_mmio_read",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 			{
 				Name:   "s390_pci_mmio_write",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 			{
 				Name:   "s390_runtime_instr",
 				Action: rspec.ActAllow,
-				Args:   []rspec.Arg{},
+				Args:   []rspec.LinuxSeccompArg{},
 			},
 		}...)
 		/* Flags parameter of the clone syscall is the 2nd on s390 */
 	}
 
-	return &rspec.Seccomp{
+	return &rspec.LinuxSeccomp{
 		DefaultAction: rspec.ActErrno,
 		Architectures: arches(),
 		Syscalls:      syscalls,
diff --git a/generate/seccomp/syscall_compare.go b/generate/seccomp/syscall_compare.go
index 01dc2e30c345..99658cf25893 100644
--- a/generate/seccomp/syscall_compare.go
+++ b/generate/seccomp/syscall_compare.go
@@ -11,7 +11,7 @@ import (
 
 // Determine if a new syscall rule should be appended, overwrite an existing rule
 // or if no action should be taken at all
-func decideCourseOfAction(newSyscall *rspec.Syscall, syscalls []rspec.Syscall) (string, error) {
+func decideCourseOfAction(newSyscall *rspec.LinuxSyscall, syscalls []rspec.LinuxSyscall) (string, error) {
 	ruleForSyscallAlreadyExists := false
 
 	var sliceOfDeterminedActions []string
@@ -83,16 +83,16 @@ func decideCourseOfAction(newSyscall *rspec.Syscall, syscalls []rspec.Syscall) (
 	return "", fmt.Errorf("Trouble determining action: %s", sliceOfDeterminedActions)
 }
 
-func hasArguments(config *rspec.Syscall) bool {
-	nilSyscall := new(rspec.Syscall)
+func hasArguments(config *rspec.LinuxSyscall) bool {
+	nilSyscall := new(rspec.LinuxSyscall)
 	return !sameArgs(nilSyscall, config)
 }
 
-func identical(config1, config2 *rspec.Syscall) bool {
+func identical(config1, config2 *rspec.LinuxSyscall) bool {
 	return reflect.DeepEqual(config1, config2)
 }
 
-func identicalExceptAction(config1, config2 *rspec.Syscall) bool {
+func identicalExceptAction(config1, config2 *rspec.LinuxSyscall) bool {
 	samename := sameName(config1, config2)
 	sameAction := sameAction(config1, config2)
 	sameArgs := sameArgs(config1, config2)
@@ -100,7 +100,7 @@ func identicalExceptAction(config1, config2 *rspec.Syscall) bool {
 	return samename && !sameAction && sameArgs
 }
 
-func identicalExceptArgs(config1, config2 *rspec.Syscall) bool {
+func identicalExceptArgs(config1, config2 *rspec.LinuxSyscall) bool {
 	samename := sameName(config1, config2)
 	sameAction := sameAction(config1, config2)
 	sameArgs := sameArgs(config1, config2)
@@ -108,33 +108,33 @@ func identicalExceptArgs(config1, config2 *rspec.Syscall) bool {
 	return samename && sameAction && !sameArgs
 }
 
-func sameName(config1, config2 *rspec.Syscall) bool {
+func sameName(config1, config2 *rspec.LinuxSyscall) bool {
 	return config1.Name == config2.Name
 }
 
-func sameAction(config1, config2 *rspec.Syscall) bool {
+func sameAction(config1, config2 *rspec.LinuxSyscall) bool {
 	return config1.Action == config2.Action
 }
 
-func sameArgs(config1, config2 *rspec.Syscall) bool {
+func sameArgs(config1, config2 *rspec.LinuxSyscall) bool {
 	return reflect.DeepEqual(config1.Args, config2.Args)
 }
 
-func bothHaveArgs(config1, config2 *rspec.Syscall) bool {
+func bothHaveArgs(config1, config2 *rspec.LinuxSyscall) bool {
 	return hasArguments(config1) && hasArguments(config2)
 }
 
-func onlyOneHasArgs(config1, config2 *rspec.Syscall) bool {
+func onlyOneHasArgs(config1, config2 *rspec.LinuxSyscall) bool {
 	conf1 := hasArguments(config1)
 	conf2 := hasArguments(config2)
 
 	return (conf1 && !conf2) || (!conf1 && conf2)
 }
 
-func neitherHasArgs(config1, config2 *rspec.Syscall) bool {
+func neitherHasArgs(config1, config2 *rspec.LinuxSyscall) bool {
 	return !hasArguments(config1) && !hasArguments(config2)
 }
 
-func firstParamOnlyHasArgs(config1, config2 *rspec.Syscall) bool {
+func firstParamOnlyHasArgs(config1, config2 *rspec.LinuxSyscall) bool {
 	return !hasArguments(config1) && hasArguments(config2)
 }
diff --git a/generate/spec.go b/generate/spec.go
index 657ed8b24545..4498aa14f038 100644
--- a/generate/spec.go
+++ b/generate/spec.go
@@ -34,41 +34,41 @@ func (g *Generator) initSpecLinuxSysctl() {
 func (g *Generator) initSpecLinuxSeccomp() {
 	g.initSpecLinux()
 	if g.spec.Linux.Seccomp == nil {
-		g.spec.Linux.Seccomp = &rspec.Seccomp{}
+		g.spec.Linux.Seccomp = &rspec.LinuxSeccomp{}
 	}
 }
 
 func (g *Generator) initSpecLinuxResources() {
 	g.initSpecLinux()
 	if g.spec.Linux.Resources == nil {
-		g.spec.Linux.Resources = &rspec.Resources{}
+		g.spec.Linux.Resources = &rspec.LinuxResources{}
 	}
 }
 
 func (g *Generator) initSpecLinuxResourcesCPU() {
 	g.initSpecLinuxResources()
 	if g.spec.Linux.Resources.CPU == nil {
-		g.spec.Linux.Resources.CPU = &rspec.CPU{}
+		g.spec.Linux.Resources.CPU = &rspec.LinuxCPU{}
 	}
 }
 
 func (g *Generator) initSpecLinuxResourcesMemory() {
 	g.initSpecLinuxResources()
 	if g.spec.Linux.Resources.Memory == nil {
-		g.spec.Linux.Resources.Memory = &rspec.Memory{}
+		g.spec.Linux.Resources.Memory = &rspec.LinuxMemory{}
 	}
 }
 
 func (g *Generator) initSpecLinuxResourcesNetwork() {
 	g.initSpecLinuxResources()
 	if g.spec.Linux.Resources.Network == nil {
-		g.spec.Linux.Resources.Network = &rspec.Network{}
+		g.spec.Linux.Resources.Network = &rspec.LinuxNetwork{}
 	}
 }
 
 func (g *Generator) initSpecLinuxResourcesPids() {
 	g.initSpecLinuxResources()
 	if g.spec.Linux.Resources.Pids == nil {
-		g.spec.Linux.Resources.Pids = &rspec.Pids{}
+		g.spec.Linux.Resources.Pids = &rspec.LinuxPids{}
 	}
 }
diff --git a/validate/validate.go b/validate/validate.go
index bce44d974633..45047af54d02 100644
--- a/validate/validate.go
+++ b/validate/validate.go
@@ -487,7 +487,7 @@ func rlimitValid(rlimit string) bool {
 	return false
 }
 
-func namespaceValid(ns rspec.Namespace) bool {
+func namespaceValid(ns rspec.LinuxNamespace) bool {
 	switch ns.Type {
 	case rspec.PIDNamespace:
 	case rspec.NetworkNamespace:
@@ -502,7 +502,7 @@ func namespaceValid(ns rspec.Namespace) bool {
 	return true
 }
 
-func deviceValid(d rspec.Device) bool {
+func deviceValid(d rspec.LinuxDevice) bool {
 	switch d.Type {
 	case "b":
 	case "c":
@@ -523,7 +523,7 @@ func deviceValid(d rspec.Device) bool {
 	return true
 }
 
-func seccompActionValid(secc rspec.Action) bool {
+func seccompActionValid(secc rspec.LinuxSeccompAction) bool {
 	switch secc {
 	case "":
 	case rspec.ActKill:
@@ -537,7 +537,7 @@ func seccompActionValid(secc rspec.Action) bool {
 	return true
 }
 
-func syscallValid(s rspec.Syscall) bool {
+func syscallValid(s rspec.LinuxSyscall) bool {
 	if !seccompActionValid(s.Action) {
 		return false
 	}
diff --git a/vendor/github.com/urfave/cli/CHANGELOG.md b/vendor/github.com/urfave/cli/CHANGELOG.md
index 8707fafab99c..07f75464b483 100644
--- a/vendor/github.com/urfave/cli/CHANGELOG.md
+++ b/vendor/github.com/urfave/cli/CHANGELOG.md
@@ -3,13 +3,6 @@
 **ATTN**: This project uses [semantic versioning](http://semver.org/).
 
 ## [Unreleased]
-### Added
-- Flag type code generation via `go generate`
-- Write to stderr and exit 1 if action returns non-nil error
-- Added support for TOML to the `altsrc` loader
-
-### Changed
-- Raise minimum tested/supported Go version to 1.2+
 
 ## [1.19.1] - 2016-11-21
 
diff --git a/vendor/github.com/urfave/cli/app.go b/vendor/github.com/urfave/cli/app.go
index 734918a61a17..95ffc0b97673 100644
--- a/vendor/github.com/urfave/cli/app.go
+++ b/vendor/github.com/urfave/cli/app.go
@@ -158,13 +158,10 @@ func (a *App) Setup() {
 	if a.Metadata == nil {
 		a.Metadata = make(map[string]interface{})
 	}
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/app.go
 
 	if a.Writer == nil {
 		a.Writer = os.Stdout
 	}
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/app.go
 }
 
 // Run is the entry point to the cli app. Parses the arguments slice and routes
@@ -482,35 +479,12 @@ func (a Author) String() string {
 // it's an ActionFunc or a func with the legacy signature for Action, the func
 // is run!
 func HandleAction(action interface{}, context *Context) (err error) {
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/app.go
 	if a, ok := action.(ActionFunc); ok {
 		return a(context)
 	} else if a, ok := action.(func(*Context) error); ok {
 		return a(context)
 	} else if a, ok := action.(func(*Context)); ok { // deprecated function signature
 		a(context)
-=======
-	defer func() {
-		if r := recover(); r != nil {
-			// Try to detect a known reflection error from *this scope*, rather than
-			// swallowing all panics that may happen when calling an Action func.
-			s := fmt.Sprintf("%v", r)
-			if strings.HasPrefix(s, "reflect: ") && strings.Contains(s, "too many input arguments") {
-				err = NewExitError(fmt.Sprintf("ERROR unknown Action error: %v.", r), 2)
-			} else {
-				panic(r)
-			}
-		}
-	}()
-
-	if reflect.TypeOf(action).Kind() != reflect.Func {
-		return errNonFuncAction
-	}
-
-	vals := reflect.ValueOf(action).Call([]reflect.Value{reflect.ValueOf(context)})
-
-	if len(vals) == 0 {
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/app.go
 		return nil
 	} else {
 		return errInvalidActionType
diff --git a/vendor/github.com/urfave/cli/command.go b/vendor/github.com/urfave/cli/command.go
index 17bcc6608d97..2628fbf48a1c 100644
--- a/vendor/github.com/urfave/cli/command.go
+++ b/vendor/github.com/urfave/cli/command.go
@@ -129,21 +129,6 @@ func (c Command) Run(ctx *Context) (err error) {
 		}
 	} else {
 		err = set.Parse(ctx.Args().Tail())
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/command.go
-=======
-	}
-
-	if err != nil {
-		if c.OnUsageError != nil {
-			err := c.OnUsageError(ctx, err, false)
-			HandleExitCoder(err)
-			return err
-		}
-		fmt.Fprintln(ctx.App.Writer, "Incorrect Usage.")
-		fmt.Fprintln(ctx.App.Writer)
-		ShowCommandHelp(ctx, c.Name)
-		return err
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/command.go
 	}
 
 	nerr := normalizeFlags(c.Flags, set)
diff --git a/vendor/github.com/urfave/cli/context.go b/vendor/github.com/urfave/cli/context.go
index 492a7422d912..cb89e92a086d 100644
--- a/vendor/github.com/urfave/cli/context.go
+++ b/vendor/github.com/urfave/cli/context.go
@@ -3,9 +3,9 @@ package cli
 import (
 	"errors"
 	"flag"
-	"os"
 	"reflect"
 	"strings"
+	"syscall"
 )
 
 // Context is a type that is passed through to
@@ -15,6 +15,7 @@ import (
 type Context struct {
 	App           *App
 	Command       Command
+	shellComplete bool
 	flagSet       *flag.FlagSet
 	setFlags      map[string]bool
 	parentContext *Context
@@ -22,7 +23,13 @@ type Context struct {
 
 // NewContext creates a new context. For use in when invoking an App or Command action.
 func NewContext(app *App, set *flag.FlagSet, parentCtx *Context) *Context {
-	return &Context{App: app, flagSet: set, parentContext: parentCtx}
+	c := &Context{App: app, flagSet: set, parentContext: parentCtx}
+
+	if parentCtx != nil {
+		c.shellComplete = parentCtx.shellComplete
+	}
+
+	return c
 }
 
 // NumFlags returns the number of flags set
@@ -91,7 +98,7 @@ func (c *Context) IsSet(name string) bool {
 
 				eachName(envVarValue.String(), func(envVar string) {
 					envVar = strings.TrimSpace(envVar)
-					if envVal := os.Getenv(envVar); envVal != "" {
+					if _, ok := syscall.Getenv(envVar); ok {
 						c.setFlags[name] = true
 						return
 					}
@@ -147,6 +154,11 @@ func (c *Context) Parent() *Context {
 	return c.parentContext
 }
 
+// value returns the value of the flag coressponding to `name`
+func (c *Context) value(name string) interface{} {
+	return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
+}
+
 // Args contains apps console arguments
 type Args []string
 
diff --git a/vendor/github.com/urfave/cli/errors.go b/vendor/github.com/urfave/cli/errors.go
index b39ff2f6f3b1..0206ff491189 100644
--- a/vendor/github.com/urfave/cli/errors.go
+++ b/vendor/github.com/urfave/cli/errors.go
@@ -100,15 +100,11 @@ func HandleExitCoder(err error) {
 	}
 
 	if err.Error() != "" {
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/errors.go
 		if _, ok := err.(ErrorFormatter); ok {
 			fmt.Fprintf(ErrWriter, "%+v\n", err)
 		} else {
 			fmt.Fprintln(ErrWriter, err)
 		}
-=======
-		fmt.Fprintln(ErrWriter, err)
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/errors.go
 	}
 	OsExiter(1)
 }
diff --git a/vendor/github.com/urfave/cli/flag.go b/vendor/github.com/urfave/cli/flag.go
index c88a6c6b3102..7dd8a2c4ab38 100644
--- a/vendor/github.com/urfave/cli/flag.go
+++ b/vendor/github.com/urfave/cli/flag.go
@@ -128,14 +128,10 @@ func (f GenericFlag) ApplyWithError(set *flag.FlagSet) error {
 		set.Var(f.Value, name, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
 // StringSlice is an opaque type for []string to satisfy flag.Value and flag.Getter
-=======
-// StringSlice is an opaque type for []string to satisfy flag.Value
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 type StringSlice []string
 
 // Set appends the string value to the list of values
@@ -154,14 +150,11 @@ func (f *StringSlice) Value() []string {
 	return *f
 }
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 // Get returns the slice of strings set by this flag
 func (f *StringSlice) Get() interface{} {
 	return *f
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f StringSliceFlag) Apply(set *flag.FlagSet) {
@@ -194,14 +187,10 @@ func (f StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
 		set.Var(f.Value, name, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
 // IntSlice is an opaque type for []int to satisfy flag.Value and flag.Getter
-=======
-// IntSlice is an opaque type for []int to satisfy flag.Value
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 type IntSlice []int
 
 // Set parses the value into an integer and appends it to the list of values
@@ -224,14 +213,11 @@ func (f *IntSlice) Value() []int {
 	return *f
 }
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 // Get returns the slice of ints set by this flag
 func (f *IntSlice) Get() interface{} {
 	return *f
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f IntSliceFlag) Apply(set *flag.FlagSet) {
@@ -264,14 +250,10 @@ func (f IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
 		set.Var(f.Value, name, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
 // Int64Slice is an opaque type for []int to satisfy flag.Value and flag.Getter
-=======
-// Int64Slice is an opaque type for []int to satisfy flag.Value
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 type Int64Slice []int64
 
 // Set parses the value into an integer and appends it to the list of values
@@ -294,14 +276,11 @@ func (f *Int64Slice) Value() []int64 {
 	return *f
 }
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 // Get returns the slice of ints set by this flag
 func (f *Int64Slice) Get() interface{} {
 	return *f
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f Int64SliceFlag) Apply(set *flag.FlagSet) {
@@ -333,10 +312,7 @@ func (f Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
 		}
 		set.Var(f.Value, name, f.Usage)
 	})
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 }
 
 // Apply populates the flag given the flag set and environment
@@ -376,12 +352,9 @@ func (f BoolFlag) ApplyWithError(set *flag.FlagSet) error {
 		set.Bool(name, val, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f BoolTFlag) Apply(set *flag.FlagSet) {
@@ -418,11 +391,8 @@ func (f BoolTFlag) ApplyWithError(set *flag.FlagSet) error {
 		}
 		set.Bool(name, val, f.Usage)
 	})
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 
 	return nil
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 }
 
 // Apply populates the flag given the flag set and environment
@@ -451,12 +421,9 @@ func (f StringFlag) ApplyWithError(set *flag.FlagSet) error {
 		set.String(name, f.Value, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f IntFlag) Apply(set *flag.FlagSet) {
@@ -486,11 +453,8 @@ func (f IntFlag) ApplyWithError(set *flag.FlagSet) error {
 		}
 		set.Int(name, f.Value, f.Usage)
 	})
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 
 	return nil
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 }
 
 // Apply populates the flag given the flag set and environment
@@ -524,12 +488,9 @@ func (f Int64Flag) ApplyWithError(set *flag.FlagSet) error {
 		set.Int64(name, f.Value, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f UintFlag) Apply(set *flag.FlagSet) {
@@ -561,12 +522,9 @@ func (f UintFlag) ApplyWithError(set *flag.FlagSet) error {
 		set.Uint(name, f.Value, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f Uint64Flag) Apply(set *flag.FlagSet) {
@@ -598,12 +556,9 @@ func (f Uint64Flag) ApplyWithError(set *flag.FlagSet) error {
 		set.Uint64(name, f.Value, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 // Apply populates the flag given the flag set and environment
 // Ignores errors
 func (f DurationFlag) Apply(set *flag.FlagSet) {
@@ -634,11 +589,8 @@ func (f DurationFlag) ApplyWithError(set *flag.FlagSet) error {
 		}
 		set.Duration(name, f.Value, f.Usage)
 	})
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 
 	return nil
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 }
 
 // Apply populates the flag given the flag set and environment
@@ -672,12 +624,9 @@ func (f Float64Flag) ApplyWithError(set *flag.FlagSet) error {
 		set.Float64(name, f.Value, f.Usage)
 	})
 
-<<<<<<< HEAD:Godeps/_workspace/src/github.com/urfave/cli/flag.go
 	return nil
 }
 
-=======
->>>>>>> update godeps and use by makefile:vendor/github.com/urfave/cli/flag.go
 func visibleFlags(fl []Flag) []Flag {
 	visible := []Flag{}
 	for _, flag := range fl {
diff --git a/vendor/github.com/urfave/cli/generate-flag-types b/vendor/github.com/urfave/cli/generate-flag-types
index 47a168be6f11..7147381ce373 100755
--- a/vendor/github.com/urfave/cli/generate-flag-types
+++ b/vendor/github.com/urfave/cli/generate-flag-types
@@ -232,6 +232,13 @@ def _write_altsrc_flag_types(outfile, types):
             f.set = set
             f.{name}Flag.Apply(set)
         }}
+
+        // ApplyWithError saves the flagSet for later usage calls, then calls the
+        // wrapped {name}Flag.ApplyWithError
+        func (f *{name}Flag) ApplyWithError(set *flag.FlagSet) error {{
+            f.set = set
+            return f.{name}Flag.ApplyWithError(set)
+        }}
         """.format(**typedef))
 
 
-- 
2.11.0

Places

File 0003-update-based-on-latest-spec.patch of Package oci-runtime-tools (Revision 73b105e352f48b857c95794d990b0784)

Places