diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-11 05:39:12 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-11 05:39:12 -0800 |
commit | b3eb23d671425775673f86bd02b9c89ef781f590 (patch) | |
tree | 5f06e4e289f16d9164d692590a3fe6541b5384cf /vendor/github.com/opencontainers/runtime-tools/generate | |
parent | 26f2b7debde313af4a5ae39727c66a3f8fd59be4 (diff) | |
parent | bd40dcfc2bc7c9014ea1f33482fb63aacbcdfe87 (diff) | |
download | podman-b3eb23d671425775673f86bd02b9c89ef781f590.tar.gz podman-b3eb23d671425775673f86bd02b9c89ef781f590.tar.bz2 podman-b3eb23d671425775673f86bd02b9c89ef781f590.zip |
Merge pull request #2102 from vrothberg/vendor-update
vendor: update everything
Diffstat (limited to 'vendor/github.com/opencontainers/runtime-tools/generate')
-rw-r--r-- | vendor/github.com/opencontainers/runtime-tools/generate/generate.go | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/vendor/github.com/opencontainers/runtime-tools/generate/generate.go b/vendor/github.com/opencontainers/runtime-tools/generate/generate.go index 955a9d5f9..1eb44770f 100644 --- a/vendor/github.com/opencontainers/runtime-tools/generate/generate.go +++ b/vendor/github.com/opencontainers/runtime-tools/generate/generate.go @@ -39,23 +39,43 @@ type ExportOptions struct { // New creates a configuration Generator with the default // configuration for the target operating system. func New(os string) (generator Generator, err error) { - if os != "linux" && os != "solaris" { + if os != "linux" && os != "solaris" && os != "windows" { return generator, fmt.Errorf("no defaults configured for %s", os) } config := rspec.Spec{ - Version: rspec.Version, - Root: &rspec.Root{ + Version: rspec.Version, + Hostname: "mrsdalloway", + } + + if os == "windows" { + config.Process = &rspec.Process{ + Args: []string{ + "cmd", + }, + Cwd: `C:\`, + ConsoleSize: &rspec.Box{ + Width: 80, + Height: 20, + }, + } + config.Windows = &rspec.Windows{ + IgnoreFlushesDuringBoot: true, + Network: &rspec.WindowsNetwork{ + AllowUnqualifiedDNSQuery: true, + }, + } + } else { + config.Root = &rspec.Root{ Path: "rootfs", Readonly: false, - }, - Process: &rspec.Process{ + } + config.Process = &rspec.Process{ Terminal: false, Args: []string{ "sh", }, - }, - Hostname: "mrsdalloway", + } } if os == "linux" || os == "solaris" { |