From 8db4d9c803b8a5cac5ceeb017f3ac1748bacc86a Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 6 Sep 2017 10:55:19 -0700 Subject: [PATCH 1/2] LCOW: VHDX boot to read-only Signed-off-by: John Howard Upstream-commit: 17a24034bb4281e2b63949beaa5d3846c0891726 Component: engine --- components/engine/libcontainerd/client_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/libcontainerd/client_windows.go b/components/engine/libcontainerd/client_windows.go index b869f96ba7..67ebb5998d 100644 --- a/components/engine/libcontainerd/client_windows.go +++ b/components/engine/libcontainerd/client_windows.go @@ -343,7 +343,7 @@ func (clnt *client) createLinux(containerID string, checkpoint string, checkpoin configuration.HvRuntime = &hcsshim.HvRuntime{ ImagePath: lcowOpt.Config.Vhdx, BootSource: "Vhd", - WritableBootSource: true, + WritableBootSource: false, } } else { configuration.HvRuntime = &hcsshim.HvRuntime{ From c87a4827940ffc30f52d74b13195034a167450ce Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 6 Sep 2017 12:55:25 -0700 Subject: [PATCH 2/2] Revendor Microsoft/opengcs @v0.3.3 Signed-off-by: John Howard Upstream-commit: bf898b7a0cedfec5b7e8104a1ac684f9dd232638 Component: engine --- components/engine/vendor.conf | 2 +- .../vendor/github.com/Microsoft/opengcs/client/config.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 535adad387..e878ed1a27 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -8,7 +8,7 @@ github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git github.com/gorilla/context v1.1 github.com/gorilla/mux v1.1 -github.com/Microsoft/opengcs v0.3.2 +github.com/Microsoft/opengcs v0.3.3 github.com/kr/pty 5cf931ef8f github.com/mattn/go-shellwords v1.0.3 github.com/sirupsen/logrus v1.0.1 diff --git a/components/engine/vendor/github.com/Microsoft/opengcs/client/config.go b/components/engine/vendor/github.com/Microsoft/opengcs/client/config.go index 12119574a3..5ece88b91d 100644 --- a/components/engine/vendor/github.com/Microsoft/opengcs/client/config.go +++ b/components/engine/vendor/github.com/Microsoft/opengcs/client/config.go @@ -93,10 +93,10 @@ func ParseOptions(options []string) (Options, error) { case "lcow.timeout": var err error if rOpts.TimeoutSeconds, err = strconv.Atoi(opt[1]); err != nil { - return rOpts, fmt.Errorf("opengcstimeoutsecs option could not be interpreted as an integer") + return rOpts, fmt.Errorf("lcow.timeout option could not be interpreted as an integer") } if rOpts.TimeoutSeconds < 0 { - return rOpts, fmt.Errorf("opengcstimeoutsecs option cannot be negative") + return rOpts, fmt.Errorf("lcow.timeout option cannot be negative") } } } @@ -242,7 +242,7 @@ func (config *Config) StartUtilityVM() error { configuration.HvRuntime = &hcsshim.HvRuntime{ ImagePath: config.Vhdx, BootSource: "Vhd", - WritableBootSource: true, + WritableBootSource: false, } } else { configuration.HvRuntime = &hcsshim.HvRuntime{